[svn-commits] dvossel: trunk r231491 - in /trunk: ./ res/res_rtp_asterisk.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Mon Nov 30 11:28:28 2009
New Revision: 231491

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=231491
Log:
Merged revisions 231441 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r231441 | dvossel | 2009-11-30 11:14:08 -0600 (Mon, 30 Nov 2009) | 11 lines
  
  fixes crash caused by RTP comfort noise payload greater than 24 bytes
  
  AST-2009-010
  
  (closes issue #16242)
  Reported by: amorsen
  Patches:
        issue16242.diff uploaded by oej (license 306)
  Tested by: amorsen, oej, dvossel
........

Modified:
    trunk/   (props changed)
    trunk/res/res_rtp_asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=231491&r1=231490&r2=231491
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Mon Nov 30 11:28:28 2009
@@ -1530,7 +1530,6 @@
 	}
 	rtp->f.frametype = AST_FRAME_CNG;
 	rtp->f.subclass.integer = data[0] & 0x7f;
-	rtp->f.datalen = len - 1;
 	rtp->f.samples = 0;
 	rtp->f.delivery.tv_usec = rtp->f.delivery.tv_sec = 0;