diff options
| author | Mark Michelson <mmichelson@digium.com> | 2008-08-06 15:59:29 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2008-08-06 15:59:29 +0000 |
| commit | b3970abc302edecc7edca4c368711732382b96b3 (patch) | |
| tree | 24af709f49d83269c9aa22a79ae30e78329ab1a2 /channels | |
| parent | 475ee479e83a2fd3f791bd4c8b827e62276ea86c (diff) | |
Merged revisions 136062 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r136062 | mmichelson | 2008-08-06 10:58:40 -0500 (Wed, 06 Aug 2008) | 16 lines
Since adding the AST_CONTROL_SRCUPDATE frame type,
there are places where ast_rtp_new_source may be called
where the tech_pvt of a channel may not yet have an
rtp structure allocated. This caused a crash in chan_skinny,
which was fixed earlier, but now the same crash has been
reported against chan_h323 as well. It seems that the best
solution is to modify ast_rtp_new_source to not attempt to
set the marker bit if the rtp structure passed in is NULL.
This change to ast_rtp_new_source also allows the removal
of what is now a redundant pointer check from chan_skinny.
(closes issue #13247)
Reported by: pj
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_skinny.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index f629cad78..bd2ff6c04 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -3909,9 +3909,7 @@ static int skinny_indicate(struct ast_channel *ast, int ind, const void *data, s case AST_CONTROL_PROCEEDING: break; case AST_CONTROL_SRCUPDATE: - if (sub->rtp) { - ast_rtp_new_source(sub->rtp); - } + ast_rtp_new_source(sub->rtp); break; default: ast_log(LOG_WARNING, "Don't know how to indicate condition %d\n", ind); |