From 099107b0aa5099a808f9575e5ab04c4be9c61828 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Fri, 17 Aug 2012 20:22:56 +0000 Subject: [PATCH] Fix memory leak in XML documentation When formatting documentation fields, the XML documentation parser calls xmldoc_get_formatted. This function allocates a string buffer at the beginning of its routine. Unfortunately, on certain code paths, it also calls xmldoc_string_cleanup, which assumes that it will create the string buffer. The previously allocated string buffer is then leaked by the xmldoc_string_cleanup routine. Now: we don't do that. (closes issue AST-932) Reported by: Alexander Homig ........ Merged revisions 371469 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 371491 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@371492 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/xmldoc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/xmldoc.c b/main/xmldoc.c index e8383511ea..bb5afe0562 100644 --- a/main/xmldoc.c +++ b/main/xmldoc.c @@ -1944,14 +1944,16 @@ static struct ast_str *xmldoc_get_formatted(struct ast_xml_node *node, int raw_o { struct ast_xml_node *tmp; const char *notcleanret, *tmpstr; - struct ast_str *ret = ast_str_create(128); + struct ast_str *ret; if (raw_output) { + /* xmldoc_string_cleanup will allocate the ret object */ notcleanret = ast_xml_get_text(node); tmpstr = notcleanret; xmldoc_string_cleanup(ast_skip_blanks(notcleanret), &ret, 0); ast_xml_free_text(tmpstr); } else { + ret = ast_str_create(128); for (tmp = ast_xml_node_get_children(node); tmp; tmp = ast_xml_node_get_next(tmp)) { /* if found, parse a element. */ if (xmldoc_parse_common_elements(tmp, "", "\n", &ret)) {