kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 18:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 179841 via svnmerge from

Browse Source 
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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@179843 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2009-03-03 18:30:47 +00:00
parent 8723b9cb36
commit e044bf8b4e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/features.c
View File

@@ -2692,8 +2692,13 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
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 */