aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-09 07:12:51 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-09 07:12:51 +0000
commitd6a9df4d865c20114434d8cbb56d3d314319187c (patch)
tree8bb5c65e9858bbef97fd2e6e0b470bb249006f03
parent95e89b34f56f222d595161313e9ab28f3481b17e (diff)
Merged revisions 211232 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r211232 | tilghman | 2009-08-09 02:11:22 -0500 (Sun, 09 Aug 2009) | 4 lines Check for NULL frame, before dereferencing pointer. (closes issue #15617) Reported by: rain ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@211234 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_stack.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/app_stack.c b/apps/app_stack.c
index 08a6c38c3..444aa4047 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -356,7 +356,12 @@ static int local_read(struct ast_channel *chan, const char *cmd, char *data, cha
oldlist = stack_store->data;
AST_LIST_LOCK(oldlist);
- frame = AST_LIST_FIRST(oldlist);
+ if (!(frame = AST_LIST_FIRST(oldlist))) {
+ /* Not within a Gosub routine */
+ AST_LIST_UNLOCK(oldlist);
+ return -1;
+ }
+
AST_LIST_TRAVERSE(&frame->varshead, variables, entries) {
if (!strcmp(data, ast_var_name(variables))) {
const char *tmp;