diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-06 15:20:01 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-06 15:20:01 +0000 |
| commit | 9ad967cb1eb9a4c97897e4c64a101491f78be107 (patch) | |
| tree | 7438b763f176ada09453093f3b70a9174d221101 | |
| parent | 24460d5ae3372dd871a4f987d8848e1fc039c357 (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.0@238011 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 9d1169772..9a22fe5b8 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; |