diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-03 18:37:46 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-03 18:37:46 +0000 |
commit | 58a09224a1d53367407f1ab6b1beb0bbc152d813 (patch) | |
tree | d931ed7c5f88409e7bd3390d3ed8074c86f632ed /apps/app_stack.c | |
parent | 88a0b23c5856660d5886d63e91e54c8fd6eee5a3 (diff) |
Add some safety measures when using gosub, especially when using the options
for app_dial and app_queue to run a gosub when the call is answered.
* Check for the existence of the gosub target in gosub_exec. If it is nonexistent,
then this will cause errors when we attempt to actually run the gosub, including
a definite memory leak and potential crashes. Return an error in this situation
* Check the return value of pbx_exec in app_dial and app_queue before attempting
to actually run the gosub routine. If there was an error, we should not attempt
to run the gosub.
* Change a '|' to a ',' in app_queue.
* Add some extra curly braces where they had been missing previously.
(closes issue #13548)
Reported by: fiddur
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@160626 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_stack.c')
-rw-r--r-- | apps/app_stack.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/apps/app_stack.c b/apps/app_stack.c index 92a0e0d74..eae4a1dfd 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -373,8 +373,9 @@ static int gosub_exec(struct ast_channel *chan, void *data) /* Create the return address, but don't save it until we know that the Gosub destination exists */ newframe = gosub_allocate_frame(chan->context, chan->exten, chan->priority + 1, args2.argc); - if (!newframe) + if (!newframe) { return -1; + } if (ast_parseable_goto(chan, label)) { ast_log(LOG_ERROR, "Gosub address is invalid: '%s'\n", (char *)data); @@ -382,6 +383,16 @@ static int gosub_exec(struct ast_channel *chan, void *data) return -1; } + if (!ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) { + ast_log(LOG_ERROR, "Attempt to reach a non-existent destination for gosub: (Context:%s, Extension:%s, Priority:%d)\n", + chan->context, chan->exten, chan->priority); + ast_copy_string(chan->context, newframe->context, sizeof(chan->context)); + ast_copy_string(chan->exten, newframe->extension, sizeof(chan->exten)); + chan->priority = newframe->priority; + ast_free(newframe); + return -1; + } + /* Now that we know for certain that we're going to a new location, set our arguments */ for (i = 0; i < args2.argc; i++) { snprintf(argname, sizeof(argname), "ARG%d", i + 1); |