diff options
| author | Russell Bryant <russell@russellbryant.com> | 2012-03-14 00:01:40 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2012-03-14 00:01:40 +0000 |
| commit | 6ec5c103d6b09721dff771679f0ca98526b4698b (patch) | |
| tree | d119a5eb65cff0c02b20e7118cb59a8ef9b31c3d | |
| parent | 14edd30fd221659a49025ccef7e4cd375a0c71c4 (diff) | |
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.
........
Merged revisions 359056 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 359057 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@359058 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index 221e5173f..905310ccf 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3257,6 +3257,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); @@ -3352,7 +3353,6 @@ const char *ast_str_retrieve_variable(struct ast_str **str, ssize_t maxlen, stru } else if (!strcmp(var, "ASTLOGDIR")) { s = ast_config_AST_LOG_DIR; } else if (!strcmp(var, "ENTITYID")) { - char workspace[20]; ast_eid_to_str(workspace, sizeof(workspace), &ast_eid_default); s = workspace; } |