[svn-commits] tilghman: branch 1.6.1 r210916 - in /branches/1.6.1: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Aug  6 16:47:17 2009
New Revision: 210916

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=210916
Log:
Merged revisions 210914 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r210914 | tilghman | 2009-08-06 16:46:01 -0500 (Thu, 06 Aug 2009) | 14 lines
  
  Merged revisions 210913 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r210913 | tilghman | 2009-08-06 16:45:01 -0500 (Thu, 06 Aug 2009) | 7 lines
    
    Because channel information can be accessed outside of the channel thread, we must lock the channel prior to modifying it.
    (closes issue #15397)
     Reported by: caspy
     Patches: 
           20090714__issue15397.diff.txt uploaded by tilghman (license 14)
     Tested by: caspy
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/channel.c

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

Modified: branches/1.6.1/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/channel.c?view=diff&rev=210916&r1=210915&r2=210916
==============================================================================
--- branches/1.6.1/main/channel.c (original)
+++ branches/1.6.1/main/channel.c Thu Aug  6 16:47:17 2009
@@ -1717,10 +1717,12 @@
 	if (chan->cdr && !ast_test_flag(chan->cdr, AST_CDR_FLAG_BRIDGED) && 
 		!ast_test_flag(chan->cdr, AST_CDR_FLAG_POST_DISABLED) && 
 	    (chan->cdr->disposition != AST_CDR_NULL || ast_test_flag(chan->cdr, AST_CDR_FLAG_DIALED))) {
+		ast_channel_lock(chan);
 			
 		ast_cdr_end(chan->cdr);
 		ast_cdr_detach(chan->cdr);
 		chan->cdr = NULL;
+		ast_channel_unlock(chan);
 	}
 	
 	ast_channel_free(chan);