summaryrefslogtreecommitdiff
path: root/pbx/pbx_config.c
diff options
context:
space:
mode:
authorDavid Vossel <dvossel@digium.com>2009-06-18 16:37:42 +0000
committerDavid Vossel <dvossel@digium.com>2009-06-18 16:37:42 +0000
commitdcfe69ec6454cecae1d6c25bbaf33e26a531b3ff (patch)
tree9e55718a16861e122cd8aed23e4b4f0369fdec92 /pbx/pbx_config.c
parent730e60e583292b45b175a021fef98a5066f0827f (diff)
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: https://origsvn.digium.com/svn/asterisk/trunk@201678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/pbx_config.c')
-rw-r--r--pbx/pbx_config.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 8bebf1385..cb89fd7d4 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -451,8 +451,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;
@@ -509,8 +508,7 @@ static char *complete_dialplan_remove_extension(struct ast_cli_args *a)
}
ast_unlock_contexts();
error3:
- if (exten)
- free(exten);
+ free(exten);
}
return ret;
}
@@ -1138,8 +1136,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;
}