[svn-commits] tilghman: branch 1.6.0 r125278 - in /branches/1.6.0: ./ main/rtp.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jun 26 06:08:34 2008
New Revision: 125278

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

................
r125277 | tilghman | 2008-06-26 06:02:11 -0500 (Thu, 26 Jun 2008) | 15 lines

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

........
r125276 | tilghman | 2008-06-26 06:01:21 -0500 (Thu, 26 Jun 2008) | 7 lines

Check for rtcp structure before trying to delete schedule.
(closes issue #12872)
 Reported by: destiny6628
 Patches: 
       20080621__bug12872.diff.txt uploaded by Corydon76 (license 14)
 Tested by: destiny6628

........

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

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://svn.digium.com/view/asterisk/branches/1.6.0/main/rtp.c?view=diff&rev=125278&r1=125277&r2=125278
==============================================================================
--- branches/1.6.0/main/rtp.c (original)
+++ branches/1.6.0/main/rtp.c Thu Jun 26 06:08:34 2008
@@ -2379,7 +2379,9 @@
 
 void ast_rtp_stop(struct ast_rtp *rtp)
 {
-	AST_SCHED_DEL(rtp->sched, rtp->rtcp->schedid);
+	if (rtp->rtcp) {
+		AST_SCHED_DEL(rtp->sched, rtp->rtcp->schedid);
+	}
 
 	memset(&rtp->them.sin_addr, 0, sizeof(rtp->them.sin_addr));
 	memset(&rtp->them.sin_port, 0, sizeof(rtp->them.sin_port));