From 07126be38971d08da987f1de22a9c7470b439efc Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 26 Jun 2008 11:08:34 +0000 Subject: [PATCH] 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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125278 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/rtp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/rtp.c b/main/rtp.c index 1f1c9e669e..3b8cc00d2c 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -2379,7 +2379,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); + } memset(&rtp->them.sin_addr, 0, sizeof(rtp->them.sin_addr)); memset(&rtp->them.sin_port, 0, sizeof(rtp->them.sin_port));