From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 13 Mar 2012 23:58:40 +0000 (+0000)
Subject: Don't use a buffer after it goes out of scope.
X-Git-Tag: 1.8.10.1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5067300bee78810290cf012f08c1ae73f660323;p=thirdparty%2Fasterisk.git

Don't use a buffer after it goes out of scope.

's' is set to 'workspace'.  Make sure 'workspace' doesn't go out of scope while
the reference to it via 's' is still used.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@359056 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/pbx.c b/main/pbx.c
index 44b4a3f921..7e6cadaa98 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3136,6 +3136,7 @@ const char *ast_str_retrieve_variable(struct ast_str **str, ssize_t maxlen, stru
 	int offset, length;
 	int i, need_substring;
 	struct varshead *places[2] = { headp, &globals };	/* list of places where we may look */
+	char workspace[20];
 
 	if (c) {
 		ast_channel_lock(c);
@@ -3211,7 +3212,6 @@ const char *ast_str_retrieve_variable(struct ast_str **str, ssize_t maxlen, stru
 		} else if (!strcmp(var, "SYSTEMNAME")) {
 			s = ast_config_AST_SYSTEM_NAME;
 		} else if (!strcmp(var, "ENTITYID")) {
-			char workspace[20];
 			ast_eid_to_str(workspace, sizeof(workspace), &ast_eid_default);
 			s = workspace;
 		}