kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 22:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

issue #5701

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-11-10 23:28:55 +00:00
parent 608d63ac54
commit 829447c811
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,5 +1,8 @@
2005-11-10 Kevin P. Fleming <kpfleming@digium.com> 2005-11-10 Kevin P. Fleming <kpfleming@digium.com>
* pbx/pbx_ael.c (handle_macro): don't leak memory (issue #5701)
(handle_context): ditto
* res/res_features.c (load_config): properly initialize referenced variable (issue #5703) * res/res_features.c (load_config): properly initialize referenced variable (issue #5703)
* apps/app_queue.c (rqm_exec): correct segfault problem (issue #5705) * apps/app_queue.c (rqm_exec): correct segfault problem (issue #5705)

3
pbx/pbx_ael.c
View File

@@ -966,6 +966,7 @@ static void handle_macro(struct ast_context **local_contexts, struct stringlink
} }
} else } else
ast_log(LOG_WARNING, "Unable to create context '%s'\n", name); ast_log(LOG_WARNING, "Unable to create context '%s'\n", name);
arg_free(paramv);
arg_free(argv); arg_free(argv);
if (vars->next) if (vars->next)
ast_log(LOG_NOTICE, "Ignoring excess tokens in macro definition around line %d of %s!\n", lineno, filename); ast_log(LOG_NOTICE, "Ignoring excess tokens in macro definition around line %d of %s!\n", lineno, filename);
@@ -1013,7 +1014,6 @@ static void parse_keyword(char *s, char **o)
static void handle_context(struct ast_context **local_contexts, struct stringlink *vars, const char *filename, int lineno) static void handle_context(struct ast_context **local_contexts, struct stringlink *vars, const char *filename, int lineno)
{ {
struct stringlink *argv; struct stringlink *argv;
struct stringlink *paramv;
struct stringlink *cur2; struct stringlink *cur2;
struct stringlink *argv2; struct stringlink *argv2;
struct stringlink *cur; struct stringlink *cur;
@@ -1026,7 +1026,6 @@ static void handle_context(struct ast_context **local_contexts, struct stringlin
if (aeldebug & DEBUG_CONTEXTS) if (aeldebug & DEBUG_CONTEXTS)
ast_verbose("Root context def is '%s'\n", vars->data); ast_verbose("Root context def is '%s'\n", vars->data);
argv = split_token(vars->data, filename, lineno); argv = split_token(vars->data, filename, lineno);
paramv = split_params(vars->data, filename, lineno);
if (aeldebug & DEBUG_CONTEXTS) if (aeldebug & DEBUG_CONTEXTS)
ast_verbose("Found context '%s'\n", vars->data); ast_verbose("Found context '%s'\n", vars->data);
snprintf(name, sizeof(name), "%s", vars->data); snprintf(name, sizeof(name), "%s", vars->data);