From 2ea6ced97afd0aa7175bd13a20d2c2e0e544ecd3 Mon Sep 17 00:00:00 2001 From: seanbright Date: Sat, 30 May 2009 03:28:29 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.2@198297 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_dial.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/app_dial.c b/apps/app_dial.c index ca3c45a22..123f8f2ed 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -719,6 +719,9 @@ static void do_forward(struct chanlist *o, const char *forward_context; ast_channel_lock(c); 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); ast_channel_unlock(c); stuff = tmpchan; -- cgit v1.2.3