[svn-commits] file: branch 1.6.1 r230041 - in /branches/1.6.1: ./ channels/chan_local.c

[SVN commits to the Digium repositories]

Author: file
Date: Fri Nov 13 13:45:35 2009
New Revision: 230041

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

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_local.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_local.c?view=diff&rev=230041&r1=230040&r2=230041
==============================================================================
--- branches/1.6.1/channels/chan_local.c (original)
+++ branches/1.6.1/channels/chan_local.c Fri Nov 13 13:45:35 2009
@@ -610,11 +610,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);