From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 26 Jun 2008 11:02:11 +0000 (+0000)
Subject: Merged revisions 125276 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~1901
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84c119cb83d179ae5d9b6fd9af4fedc7843018cb;p=thirdparty%2Fasterisk.git

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125277 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/rtp.c b/main/rtp.c
index 9afd0b940e..146e8c0936 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -2585,7 +2585,9 @@ struct ast_rtp *ast_rtp_get_bridged(struct ast_rtp *rtp)
 
 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);
+	}
 	if (rtp->red) {
 		AST_SCHED_DEL(rtp->sched, rtp->red->schedid);
 		free(rtp->red);