mirror of
https://github.com/asterisk/asterisk.git
synced 2026-06-05 13:55:30 +00:00
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.4@179840 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1958,8 +1958,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 */
|
||||
|
||||
Reference in New Issue
Block a user