mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-16 06:48:25 +00:00
Merged revisions 198285 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r198285 | seanbright | 2009-05-29 23:26:06 -0400 (Fri, 29 May 2009) | 15 lines Merged revisions 198251 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r198251 | seanbright | 2009-05-29 22:46:41 -0400 (Fri, 29 May 2009) | 8 lines Treat an empty FORWARD_CONTEXT the same way we treat a missing one. (closes issue #15056) Reported by: p_lindheimer Patches: 05292009_bug15056.diff uploaded by seanbright (license 71) Tested by: p_lindheimer ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@198297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -719,6 +719,9 @@ static void do_forward(struct chanlist *o,
|
|||||||
const char *forward_context;
|
const char *forward_context;
|
||||||
ast_channel_lock(c);
|
ast_channel_lock(c);
|
||||||
forward_context = pbx_builtin_getvar_helper(c, "FORWARD_CONTEXT");
|
forward_context = pbx_builtin_getvar_helper(c, "FORWARD_CONTEXT");
|
||||||
|
if (ast_strlen_zero(forward_context)) {
|
||||||
|
forward_context = NULL;
|
||||||
|
}
|
||||||
snprintf(tmpchan, sizeof(tmpchan), "%s@%s", c->call_forward, forward_context ? forward_context : c->context);
|
snprintf(tmpchan, sizeof(tmpchan), "%s@%s", c->call_forward, forward_context ? forward_context : c->context);
|
||||||
ast_channel_unlock(c);
|
ast_channel_unlock(c);
|
||||||
stuff = tmpchan;
|
stuff = tmpchan;
|
||||||
|
|||||||
Reference in New Issue
Block a user