[Asterisk-code-review] config.c: Fix off-nominal memory leak. (asterisk[certified/13.1])
Joshua Colp
asteriskteam at digium.com
Fri Oct 16 10:36:07 CDT 2015
Joshua Colp has submitted this change and it was merged.
Change subject: config.c: Fix off-nominal memory leak.
......................................................................
config.c: Fix off-nominal memory leak.
Change-Id: I06e346e9a5c63cc5071e7eda537310c4b43bffe0
---
M main/config.c
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
Anonymous Coward #1000019: Verified
Joshua Colp: Looks good to me, approved
diff --git a/main/config.c b/main/config.c
index 5ced524..6f6f7ca 100644
--- a/main/config.c
+++ b/main/config.c
@@ -1659,6 +1659,7 @@
/* 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;
}
@@ -1687,6 +1688,9 @@
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;
}
--
To view, visit https://gerrit.asterisk.org/1430
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06e346e9a5c63cc5071e7eda537310c4b43bffe0
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: certified/13.1
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
More information about the asterisk-code-review
mailing list