[asterisk-commits] file: branch 1.6.1 r179843 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Mar  3 12:30:47 2009
New Revision: 179843

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

................
  r179841 | file | 2009-03-03 14:28:46 -0400 (Tue, 03 Mar 2009) | 16 lines
  
  Merged revisions 179840 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r179840 | file | 2009-03-03 14:27:09 -0400 (Tue, 03 Mar 2009) | 9 lines
    
    Do not assume that the bridge_cdr is still attached to the channel when the 'h' exten is finished executing.
    
    It is possible for a masquerade operation to occur when the 'h' exten is operating. This operation moves
    the CDR records around causing the bridge_cdr to no longer exist on the channel where it is expected to.
    We can not safely modify it afterwards because of this, so don't even try.
    
    (closes issue #14564)
    Reported by: meric
  ........
................

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

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

Modified: branches/1.6.1/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=179843&r1=179842&r2=179843
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Tue Mar  3 12:30:47 2009
@@ -2692,8 +2692,13 @@
 		ast_channel_lock(chan);
 		ast_copy_string(chan->exten, save_exten, sizeof(chan->exten));
 		chan->priority = save_prio;
-		if (bridge_cdr)
-			chan->cdr = swapper;
+		if (bridge_cdr) {
+			if (chan->cdr == bridge_cdr) {
+				chan->cdr = swapper;
+			} else {
+				bridge_cdr = NULL;
+			}
+		}
 		ast_set_flag(chan, AST_FLAG_BRIDGE_HANGUP_RUN);
 		ast_channel_unlock(chan);
 		/* protect the lastapp/lastdata against the effects of the hangup/dialplan code */