[asterisk-commits] qwell: trunk r71916 - in /trunk: ./ main/rtp.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Jun 26 15:36:50 2007
New Revision: 71916

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

........
r71915 | qwell | 2007-06-26 15:36:09 -0500 (Tue, 26 Jun 2007) | 4 lines

Don't dereference a pointer that may be NULL here.

Issue 10017.

........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

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

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=71916&r1=71915&r2=71916
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Tue Jun 26 15:36:50 2007
@@ -2709,6 +2709,9 @@
 	struct ast_rtp *rtp = data;
 	int res;
 	
+	if (!rtp || !rtp->rtcp)
+		return 0;
+
 	if (rtp->txcount > rtp->rtcp->lastsrtxcount)
 		res = ast_rtcp_write_sr(data);
 	else