From 675f43f24f3639aae3808e734edb553856c14618 Mon Sep 17 00:00:00 2001
From: Kinsey Moore <kmoore@digium.com>
Date: Thu, 7 Mar 2013 16:21:52 +0000
Subject: [PATCH] Resolve more memory leaks in xmldoc
Many places that allocated to pull out an attribute are now freed
properly.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@382600 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/xmldoc.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/main/xmldoc.c b/main/xmldoc.c
index d0f8dbbbf5..71def2aa3c 100644
--- a/main/xmldoc.c
+++ b/main/xmldoc.c
@@ -760,6 +760,7 @@ static char *xmldoc_get_syntax_fun(struct ast_xml_node *rootnode, const char *ro
if ((paramtype = ast_xml_get_attribute(node, "required"))) {
if (!ast_true(paramtype)) {
optmidnode = 1;
+ ast_xml_free_attr(paramtype);
break;
}
ast_xml_free_attr(paramtype);
@@ -2347,16 +2348,22 @@ static void build_config_docs(struct ast_xml_node *cur, struct ast_xml_doc_item
struct ast_xml_doc_item *item;
for (iter = ast_xml_node_get_children(cur); iter; iter = ast_xml_node_get_next(iter)) {
+ const char *iter_name;
if (strncasecmp(ast_xml_node_get_name(iter), "config", 6)) {
continue;
}
+ iter_name = ast_xml_get_attribute(iter, "name");
/* Now add all of the child config-related items to the list */
- if (!(item = xmldoc_build_documentation_item(iter, ast_xml_get_attribute(iter, "name"), ast_xml_node_get_name(iter)))) {
- ast_log(LOG_ERROR, "Could not build documentation for '%s:%s'\n", ast_xml_node_get_name(iter), ast_xml_get_attribute(iter, "name"));
+ if (!(item = xmldoc_build_documentation_item(iter, iter_name, ast_xml_node_get_name(iter)))) {
+ ast_log(LOG_ERROR, "Could not build documentation for '%s:%s'\n", ast_xml_node_get_name(iter), iter_name);
+ ast_xml_free_attr(iter_name);
break;
}
+ ast_xml_free_attr(iter_name);
if (!strcasecmp(ast_xml_node_get_name(iter), "configOption")) {
- ast_string_field_set(item, ref, ast_xml_get_attribute(cur, "name"));
+ const char *name = ast_xml_get_attribute(cur, "name");
+ ast_string_field_set(item, ref, name);
+ ast_xml_free_attr(name);
}
(*tail)->next = item;
*tail = (*tail)->next;
--
GitLab