summaryrefslogtreecommitdiff
path: root/apps/app_mp3.c
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2010-01-06 15:19:10 +0000
committerRussell Bryant <russell@russellbryant.com>2010-01-06 15:19:10 +0000
commit5d7b80248be32f5d7989eec97f3d8d81736e6b9e (patch)
tree60bd7210dd298f9ec659970771f7dde6131ccda7 /apps/app_mp3.c
parent82f998dcd47e9dff786ddd50b8a966a111362dbb (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: https://origsvn.digium.com/svn/asterisk/trunk@238010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_mp3.c')
-rw-r--r--apps/app_mp3.c6
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;