Merged revisions 238009 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 6 Jan 2010 15:19:10 +0000 (15:19 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 6 Jan 2010 15:19:10 +0000 (15:19 +0000)
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/trunk@238010 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_mp3.c

index b216307..f8e42a1 100644 (file)
@@ -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;