[svn-commits] file: branch 1.4 r230038 - /branches/1.4/channels/chan_local.c

[SVN commits to the Digium repositories]

Author: file
Date: Fri Nov 13 13:44:07 2009
New Revision: 230038

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=230038
Log:
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

Modified:
    branches/1.4/channels/chan_local.c

Modified: branches/1.4/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_local.c?view=diff&rev=230038&r1=230037&r2=230038
==============================================================================
--- branches/1.4/channels/chan_local.c (original)
+++ branches/1.4/channels/chan_local.c Fri Nov 13 13:44:07 2009
@@ -574,11 +574,11 @@
 		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);