diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-13 19:45:13 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-13 19:45:13 +0000 |
| commit | b7a02886fd48bec2d2660f086f38707ceae4c2c9 (patch) | |
| tree | 5932f99fc8fd9c55f601099d2470a02f4a98e4f5 /channels | |
| parent | 273fffca58a99e0096be7633a531673e50f07a91 (diff) | |
Merged revisions 230039 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r230039 | file | 2009-11-13 13:44:53 -0600 (Fri, 13 Nov 2009) | 16 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@230040 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 9b821a101..7c8aa8d75 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -570,11 +570,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); |