[svn-commits] tilghman: trunk r210914 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Aug  6 16:46:01 2009
New Revision: 210914

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=210914
Log:
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:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/channel.c?view=diff&rev=210914&r1=210913&r2=210914
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Aug  6 16:46:01 2009
@@ -2163,10 +2163,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);
 	}
 
 	chan = ast_channel_release(chan);