[asterisk-commits] russell: branch 1.6.1 r238012 - in /branches/1.6.1: ./ apps/app_mp3.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Jan  6 09:21:29 2010
New Revision: 238012

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=238012
Log:
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)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_mp3.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_mp3.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_mp3.c?view=diff&rev=238012&r1=238011&r2=238012
==============================================================================
--- branches/1.6.1/apps/app_mp3.c (original)
+++ branches/1.6.1/apps/app_mp3.c Wed Jan  6 09:21:29 2010
@@ -121,8 +121,10 @@
 		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;