From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sun, 9 Aug 2009 07:12:51 +0000 (+0000)
Subject: Merged revisions 211232 via svnmerge from
X-Git-Tag: 1.6.1.5-rc1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aff3871fa3e33cc42f4d33d47471df3ccb93eab7;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@211234 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_stack.c b/apps/app_stack.c
index 08a6c38c31..444aa40478 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;