summaryrefslogtreecommitdiff
path: root/main/config.c
diff options
context:
space:
mode:
Diffstat (limited to 'main/config.c')
-rw-r--r--main/config.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/main/config.c b/main/config.c
index 25bc013dd..98fa9a292 100644
--- a/main/config.c
+++ b/main/config.c
@@ -1679,6 +1679,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
/* If there are options or categories to inherit from, process them now */
if (c) {
if (!(cur = strchr(c, ')'))) {
+ ast_category_destroy(newcat);
ast_log(LOG_WARNING, "parse error: no closing ')', line %d of %s\n", lineno, configfile);
return -1;
}
@@ -1707,10 +1708,16 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
base = ast_category_get(cfg, cur, "TEMPLATES=include");
if (!base) {
+ if (newcat) {
+ ast_category_destroy(newcat);
+ }
ast_log(LOG_WARNING, "Inheritance requested, but category '%s' does not exist, line %d of %s\n", cur, lineno, configfile);
return -1;
}
if (ast_category_inherit(*cat, base)) {
+ if (newcat) {
+ ast_category_destroy(newcat);
+ }
ast_log(LOG_ERROR, "Inheritence requested, but allocation failed\n");
return -1;
}