diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-06 15:22:41 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-06 15:22:41 +0000 |
| commit | 3cc57ea2a6693a7238ff6ed3bdf551f8f9c274fc (patch) | |
| tree | db87b0cff351ef082cd820ff35f258ddcccbf5ef /apps | |
| parent | 8d7e026f79428877d1836ae5f505da75312b8ecf (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.2@238013 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -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 41e27f9b3..63c424a90 100644 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -131,8 +131,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; |