From 0740578e6df8e4cb4cb49a2550f5946ceaf0e509 Mon Sep 17 00:00:00 2001 From: dvossel Date: Thu, 18 Jun 2009 16:58:03 +0000 Subject: Merged revisions 201678 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r201678 | dvossel | 2009-06-18 11:37:42 -0500 (Thu, 18 Jun 2009) | 11 lines fixes some memory leaks and redundant conditions (closes issue #15269) Reported by: contactmayankjain Patches: patch.txt uploaded by contactmayankjain (license 740) memory_leak_stuff.trunk.diff uploaded by dvossel (license 671) Tested by: contactmayankjain, dvossel ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@201682 f38db490-d61c-443f-a65b-d21fe96a405b --- pbx/pbx_config.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'pbx') diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 8e27ec8a5..23dc96e70 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -450,8 +450,7 @@ static char *complete_dialplan_remove_extension(struct ast_cli_args *a) ast_unlock_contexts(); error2: - if (exten) - free(exten); + free(exten); } else if (a->pos == 4) { /* 'dialplan remove extension EXT _X_' (priority) */ char *exten = NULL, *context, *cid, *p; struct ast_context *c; @@ -508,8 +507,7 @@ static char *complete_dialplan_remove_extension(struct ast_cli_args *a) } ast_unlock_contexts(); error3: - if (exten) - free(exten); + free(exten); } return ret; } @@ -1134,8 +1132,7 @@ static char *complete_dialplan_add_ignorepat(struct ast_cli_args *a) ret = strdup(ast_get_context_name(c)); } - if (ignorepat) - free(ignorepat); + free(ignorepat); ast_unlock_contexts(); return ret; } -- cgit v1.2.3