diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-06 15:58:40 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-06 15:58:40 +0000 |
| commit | 5a4712d2891183d986d051735b568a3e4f9a416c (patch) | |
| tree | 707ddddd07cbc47f00ce2e7a5da00ef6206a7001 | |
| parent | 44ebcf17bcde54e7fa45f7528ccdabb3d389dd1d (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@136062 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_skinny.c | 4 | ||||
| -rw-r--r-- | main/rtp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 80ce09201..51b1839d5 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -2868,9 +2868,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); diff --git a/main/rtp.c b/main/rtp.c index 14d8aafcd..bbdb9d649 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -2000,7 +2000,9 @@ int ast_rtp_settos(struct ast_rtp *rtp, int tos) void ast_rtp_new_source(struct ast_rtp *rtp) { - rtp->set_marker_bit = 1; + if (rtp) { + rtp->set_marker_bit = 1; + } return; } |