[asterisk-commits] dvossel: branch 1.6.0 r231517 - in /branches/1.6.0: ./ main/rtp.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon Nov 30 11:34:17 2009
New Revision: 231517

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

................
  r231491 | dvossel | 2009-11-30 11:28:28 -0600 (Mon, 30 Nov 2009) | 17 lines
  
  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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/rtp.c

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

Modified: branches/1.6.0/main/rtp.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/rtp.c?view=diff&rev=231517&r1=231516&r2=231517
==============================================================================
--- branches/1.6.0/main/rtp.c (original)
+++ branches/1.6.0/main/rtp.c Mon Nov 30 11:34:17 2009
@@ -1074,7 +1074,6 @@
 	}
 	rtp->f.frametype = AST_FRAME_CNG;
 	rtp->f.subclass = data[0] & 0x7f;
-	rtp->f.datalen = len - 1;
 	rtp->f.samples = 0;
 	rtp->f.delivery.tv_usec = rtp->f.delivery.tv_sec = 0;
 	f = &rtp->f;