From 2ee78bf6e63634bbe7e5b2319f6334aa587d019e Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 6 Jan 2010 15:21:29 +0000 Subject: [PATCH] Merged revisions 238010 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r238010 | russell | 2010-01-06 09:19:10 -0600 (Wed, 06 Jan 2010) | 14 lines Merged revisions 238009 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r238009 | russell | 2010-01-06 09:18:22 -0600 (Wed, 06 Jan 2010) | 7 lines Resolve a crash due to an ast_frame not being fully initialized. (closes issue #16531) Reported by: john8675309 (closes SWP-615) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@238012 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_mp3.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/app_mp3.c b/apps/app_mp3.c index cf81e73d7a..8f91df8df4 100644 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -121,8 +121,10 @@ static int mp3_exec(struct ast_channel *chan, void *data) struct ast_frame f; char offset[AST_FRIENDLY_OFFSET]; short frdata[160]; - } myf; - + } myf = { + .f = { 0, }, + }; + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "MP3 Playback requires an argument (filename)\n"); return -1; -- 2.47.2