diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-07-16 20:48:27 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-07-16 20:48:27 +0000 |
| commit | 2842b71a325d80f3234bf7e817bef5d20b603b69 (patch) | |
| tree | 56c9c8f3f13599f210ec27a2665706a93aa7500a | |
| parent | b4dac0b3858a77fbd1557e24a211e0914ca407ae (diff) | |
Merged revisions 131421 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r131421 | russell | 2008-07-16 15:47:53 -0500 (Wed, 16 Jul 2008) | 7 lines
Always ensure that the channel's tech_pvt reference is NULL after calling the
destroy callback.
(closes issue #13060)
Reported by: jpgrayson
Patches:
chan_iax2_tech_pvt_crash.patch uploaded by jpgrayson (license 492)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@131422 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_iax2.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 874508028..06404dd0a 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -3738,6 +3738,12 @@ static int iax2_hangup(struct ast_channel *c) ast_debug(1, "Really destroying %s now...\n", c->name); iax2_destroy(callno); } + } else if (c->tech_pvt) { + /* If this call no longer exists, but the channel still + * references it we need to set the channel's tech_pvt to null + * to avoid ast_channel_free() trying to free it. + */ + c->tech_pvt = NULL; } ast_mutex_unlock(&iaxsl[callno]); ast_verb(3, "Hungup '%s'\n", c->name); |