From e14023ca3543d91bc108f8f21af0509c2a428e47 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Mon, 12 Oct 2015 11:21:39 -0500 Subject: [PATCH] config.c: Fix off-nominal memory leak. Change-Id: I06e346e9a5c63cc5071e7eda537310c4b43bffe0 --- main/config.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/main/config.c b/main/config.c index 1778494412..eefc8ca3b6 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; } -- 2.47.2