diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-06 15:19:10 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-06 15:19:10 +0000 |
commit | 67e78241fb87de79748042f40ae9eaa5aafb1aad (patch) | |
tree | 60bd7210dd298f9ec659970771f7dde6131ccda7 /apps | |
parent | c26a1c46a0e99f160a388ab482286c0c85efe7d1 (diff) |
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: http://svn.digium.com/svn/asterisk/trunk@238010 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_mp3.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/app_mp3.c b/apps/app_mp3.c index b2163070a..f8e42a12c 100644 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -145,8 +145,10 @@ static int mp3_exec(struct ast_channel *chan, const char *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; |