diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-26 11:08:34 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-26 11:08:34 +0000 |
| commit | 0d6a1a00dafe2a05a1c86b4580a1452914d76689 (patch) | |
| tree | 89ae414040c03b703e9db2eee2ff1a069d7394a8 /main | |
| parent | 7f4ab0402c7d9d62cd3ec8286acd68e73b686680 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@125278 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/rtp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/rtp.c b/main/rtp.c index 1f1c9e669..3b8cc00d2 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)); |