summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2008-06-26 11:02:11 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2008-06-26 11:02:11 +0000
commit84c119cb83d179ae5d9b6fd9af4fedc7843018cb (patch)
treedfb332ddaeb0dabd2614de696f42aa608124ed7d
parente903ae0e910a364835dc21602a5ae3a6570cbadc (diff)
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
-rw-r--r--main/rtp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/rtp.c b/main/rtp.c
index 9afd0b940..146e8c093 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);