diff options
author | Joshua Colp <jcolp@digium.com> | 2009-11-13 19:44:53 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2009-11-13 19:44:53 +0000 |
commit | 85dd68ca7a4ef7eea76c3fbc85f7beb5fb050bdd (patch) | |
tree | cb8a9a802f26472a770b92787a157648141a1d38 /channels/chan_local.c | |
parent | f62d03a8f3d1ef3e31b9bb71682597936cd5d659 (diff) |
Merged revisions 230038 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r230038 | file | 2009-11-13 13:44:07 -0600 (Fri, 13 Nov 2009) | 9 lines
Fix a crash caused by two threads thinking they should both free the
chan_local private structure when only one should.
(closes issue #15314)
Reported by: sroberts
Patches:
Issue15314_Move_Nulling_owner.patch uploaded by davidw (license 780)
Tested by: davidw, lottc
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@230039 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_local.c')
-rw-r--r-- | channels/chan_local.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 453375319..00c058da1 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -692,11 +692,11 @@ static int local_hangup(struct ast_channel *ast) ast_clear_flag(p, LOCAL_LAUNCHED_PBX); ast_module_user_remove(p->u_chan); } else { - p->owner = NULL; ast_module_user_remove(p->u_owner); while (p->chan && ast_channel_trylock(p->chan)) { DEADLOCK_AVOIDANCE(&p->lock); } + p->owner = NULL; if (p->chan) { ast_queue_hangup(p->chan); ast_channel_unlock(p->chan); |