From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 6 Jan 2010 15:20:01 +0000 (+0000)
Subject: Merged revisions 238010 via svnmerge from
X-Git-Tag: 1.6.0.21-rc1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7222ae2fe20648c1f7bb30ec4ba0296615712165;p=thirdparty%2Fasterisk.git

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.0@238011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 9d1169772f..9a22fe5b88 100644
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -147,8 +147,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;