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
certified/1.8.15
Russell Bryant 14 years ago
parent ac53c0d94e
commit f5067300be

@ -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;
}

Loading…
Cancel
Save