[asterisk-commits] russell: branch 1.6.0 r116980 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: russell
Date: Sun May 18 22:44:51 2008
New Revision: 116980

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116980
Log:
Merged revisions 116979 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r116979 | russell | 2008-05-18 22:44:28 -0500 (Sun, 18 May 2008) | 12 lines

Merged revisions 116978 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r116978 | russell | 2008-05-18 22:44:04 -0500 (Sun, 18 May 2008) | 4 lines

Avoid access of uninitialized memory.  This caused a bunch of crashes for me
while doing load testing of development branch where I'm working on some
performance improvements.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c

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

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=116980&r1=116979&r2=116980
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Sun May 18 22:44:51 2008
@@ -7892,7 +7892,7 @@
 
 	/* allocate an iax_frame with 4096 bytes of data buffer */
 	fr = alloca(sizeof(*fr) + 4096);
-	fr->callno = 0;
+	memset(fr, 0, sizeof(*fr));
 	fr->afdatalen = 4096; /* From alloca() above */
 
 	/* Copy frequently used parameters to the stack */