From bf13951c9f69b1a1c6f06576bbb9db1dfb70130c Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Fri, 10 Feb 2012 18:05:57 +0000 Subject: [PATCH] Fix AMI Redirect ExtraChannel not redirecting to the same exten and context. The astman_get_header() never returns NULL so the check by the code for NULL would never fail. (closes issue ASTERISK-16974) Reported by: Nuno Borges Patches: 0018325.patch (license #6116) patch uploaded by Nuno Borges (modified) ........ Merged revisions 354835 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@354836 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/main/manager.c b/main/manager.c index 7b30ec0267..bd1c8f0aeb 100644 --- a/main/manager.c +++ b/main/manager.c @@ -3515,7 +3515,7 @@ static int action_redirect(struct mansession *s, const struct message *m) ast_set_flag(chan2, AST_FLAG_BRIDGE_HANGUP_DONT); /* don't let the after-bridge code run the h-exten */ ast_channel_unlock(chan2); } - if (context2) { + if (!ast_strlen_zero(context2)) { res = ast_async_goto(chan2, context2, exten2, pi2); } else { res = ast_async_goto(chan2, context, exten, pi); @@ -3535,10 +3535,7 @@ static int action_redirect(struct mansession *s, const struct message *m) astman_send_error(s, m, "Redirect failed"); } - if (chan) { - chan = ast_channel_unref(chan); - } - + chan = ast_channel_unref(chan); if (chan2) { chan2 = ast_channel_unref(chan2); } -- 2.47.2