From 131ad5a868f06b29b4e4a116cc686366ea15cc6b Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Mon, 25 Jun 2012 15:59:28 +0000 Subject: [PATCH] Fix Bridge application occasionally returning to the wrong location. * Fix do_bridge_masquerade() getting the resume location from the zombie channel. The code must not touch a clone channel after it has masqueraded it. The clone channel has become a zombie and is starting to hangup. (closes issue ASTERISK-19985) Reported by: jamicque Patches: jira_asterisk_19985_v1.8.patch (license #5621) patch uploaded by rmudgett Tested by: jamicque ........ Merged revisions 369327 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@369328 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/features.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/main/features.c b/main/features.c index 7282eca441..e31400fd2c 100644 --- a/main/features.c +++ b/main/features.c @@ -6828,8 +6828,15 @@ static char *handle_features_reload(struct ast_cli_entry *e, int cmd, struct ast */ static int do_bridge_masquerade(struct ast_channel *chan, struct ast_channel *tmpchan) { + const char *context; + const char *exten; + int priority; + ast_moh_stop(chan); ast_channel_lock_both(chan, tmpchan); + context = ast_strdupa(chan->context); + exten = ast_strdupa(chan->exten); + priority = chan->priority; ast_setstate(tmpchan, chan->_state); tmpchan->readformat = chan->readformat; tmpchan->writeformat = chan->writeformat; @@ -6843,7 +6850,7 @@ static int do_bridge_masquerade(struct ast_channel *chan, struct ast_channel *tm ast_do_masquerade(tmpchan); /* when returning from bridge, the channel will continue at the next priority */ - ast_explicit_goto(tmpchan, chan->context, chan->exten, chan->priority + 1); + ast_explicit_goto(tmpchan, context, exten, priority + 1); return 0; } -- 2.47.2