aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-06 15:21:29 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-06 15:21:29 +0000
commitda0b9a53f85ba30ac0a334c690f4d0ebadcaf4f3 (patch)
tree33ba1cae572eab3026fe4c680f3bec3e13434c87
parent6757fb6bb9f861586d90ece7aed5ef256585facf (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@238012 f38db490-d61c-443f-a65b-d21fe96a405b
-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 cf81e73d7..8f91df8df 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;