[asterisk-commits] mmichelson: branch 1.6.1 r209237 - in /branches/1.6.1: ./ main/rtp.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Jul 27 15:57:55 2009
New Revision: 209237

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=209237
Log:
Merged revisions 209235 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r209235 | mmichelson | 2009-07-27 15:54:54 -0500 (Mon, 27 Jul 2009) | 5 lines
  
  Gracefully handle malformed RTP text packets.
  
  AST-2009-004
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/rtp.c

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

Modified: branches/1.6.1/main/rtp.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/rtp.c?view=diff&rev=209237&r1=209236&r2=209237
==============================================================================
--- branches/1.6.1/main/rtp.c (original)
+++ branches/1.6.1/main/rtp.c Mon Jul 27 15:57:55 2009
@@ -1840,6 +1840,9 @@
 
 		rtp->f.subclass = AST_FORMAT_T140;
 		header_end = memchr(data, ((*data) & 0x7f), rtp->f.datalen);
+		if (header_end == NULL) {
+			return &ast_null_frame;
+		}
 		header_end++;
 		
 		header_length = header_end - data;