mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Fix a crash in the end_bridge_callback of app_dial and
app_followme which would occur at the end of an attended transfer. The error occurred because we initially stored a pointer to an ast_channel which then was hung up due to a masquerade. This commit adds a "fixup" callback to the bridge_config structure to allow for end_bridge_callback_data to be changed in the case that a new channel pointer is needed for the end_bridge_callback. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@157305 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -982,6 +982,10 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
|
||||
tobj->peer = xferchan;
|
||||
tobj->bconfig = *config;
|
||||
|
||||
if (tobj->bconfig.end_bridge_callback_data_fixup) {
|
||||
tobj->bconfig.end_bridge_callback_data_fixup(&tobj->bconfig, tobj->peer, tobj->chan);
|
||||
}
|
||||
|
||||
if (ast_stream_and_wait(newchan, xfersound, newchan->language, ""))
|
||||
ast_log(LOG_WARNING, "Failed to play transfer sound!\n");
|
||||
ast_bridge_call_thread_launch(tobj);
|
||||
|
Reference in New Issue
Block a user