From e4c1fc1e4a5db155285bf444963bcdedaa885e5d Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 17 Dec 2009 17:19:08 +0000
Subject: [PATCH] Merged revisions 235421 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r235421 | tilghman | 2009-12-17 11:17:51 -0600 (Thu, 17 Dec 2009) | 8 lines
Use context from which Macro is executed, not macro context, if applicable.
Also, ensure that the extension COULD match, not just that it won't match more.
(closes issue #16113)
Reported by: OrNix
Patches:
20091216__issue16113.diff.txt uploaded by tilghman (license 14)
Tested by: OrNix
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@235422 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/pbx.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/main/pbx.c b/main/pbx.c
index 4843022686..019f2b9f68 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -9126,8 +9126,16 @@ static int pbx_builtin_background(struct ast_channel *chan, const char *data)
if (ast_strlen_zero(args.lang))
args.lang = (char *)chan->language; /* XXX this is const */
- if (ast_strlen_zero(args.context))
- args.context = chan->context;
+ if (ast_strlen_zero(args.context)) {
+ const char *context;
+ ast_channel_lock(chan);
+ if ((context = pbx_builtin_getvar_helper(chan, "MACRO_CONTEXT"))) {
+ args.context = ast_strdupa(context);
+ } else {
+ args.context = chan->context;
+ }
+ ast_channel_unlock(chan);
+ }
if (args.options) {
if (!strcasecmp(args.options, "skip"))
@@ -9185,7 +9193,9 @@ static int pbx_builtin_background(struct ast_channel *chan, const char *data)
* gone immediately to the "i" extension, but will now need to wait for a
* timeout.
*/
- if ((exten[0] = res) && !ast_matchmore_extension(chan, args.context, exten, 1, chan->cid.cid_num)) {
+ if ((exten[0] = res) &&
+ ast_canmatch_extension(chan, args.context, exten, 1, chan->cid.cid_num) &&
+ !ast_matchmore_extension(chan, args.context, exten, 1, chan->cid.cid_num)) {
snprintf(chan->exten, sizeof(chan->exten), "%c", res);
ast_copy_string(chan->context, args.context, sizeof(chan->context));
chan->priority = 0;