From: Joshua Colp <jcolp@digium.com>
Date: Fri, 13 Nov 2009 19:45:13 +0000 (+0000)
Subject: Merged revisions 230039 via svnmerge from
X-Git-Tag: 1.6.0.20-rc1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2ac09ca2279f396ae991e726b429eea4c6ecc2f;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@230040 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 9b821a1019..7c8aa8d759 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);