diff options
| author | Kevin Harwell <kharwell@digium.com> | 2013-08-30 17:59:06 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2013-08-30 17:59:06 +0000 |
| commit | af1747ee6c23359e9ac9b88d7821a1985899de60 (patch) | |
| tree | 83bce3f9ea8f1ba8746d418f5503d9d4c3959f11 /res/res_agi.c | |
| parent | 9f1379686f3cf2df9c73aa32dcf37bba520bd75a (diff) | |
Memory leak fix
ast_xmldoc_printable returns an allocated block that must be freed by the
caller. Fixed manager.c and res_agi.c to stop leaking these results.
(closes issue ASTERISK-22395)
Reported by: Corey Farrell
Patches:
manager-leaks-12.patch uploaded by coreyfarrell (license 5909)
res_agi-xmldoc-leaks.patch uploaded by coreyfarrell (license 5909)
........
Merged revisions 398060 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 398061 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 398062 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@398063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_agi.c')
| -rw-r--r-- | res/res_agi.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index 74d665bd5..25251f37e 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -4042,9 +4042,6 @@ static int write_htmldump(const char *filename) AST_RWLIST_RDLOCK(&agi_commands); AST_RWLIST_TRAVERSE(&agi_commands, command, list) { -#ifdef AST_XML_DOCS - char *stringptmp; -#endif char *tempstr, *stringp; if (!command->cmda[0]) /* end ? */ @@ -4057,8 +4054,7 @@ static int write_htmldump(const char *filename) fprintf(htmlfile, "<TR><TD><TABLE BORDER=\"1\" CELLPADDING=\"5\" WIDTH=\"100%%\">\n"); fprintf(htmlfile, "<TR><TH ALIGN=\"CENTER\"><B>%s - %s</B></TH></TR>\n", fullcmd, command->summary); #ifdef AST_XML_DOCS - stringptmp = ast_xmldoc_printable(command->usage, 0); - stringp = ast_strdup(stringptmp); + stringp = ast_xmldoc_printable(command->usage, 0); #else stringp = ast_strdup(command->usage); #endif @@ -4076,9 +4072,6 @@ static int write_htmldump(const char *filename) fprintf(htmlfile, "</TD></TR>\n"); fprintf(htmlfile, "</TABLE></TD></TR>\n\n"); ast_free(stringp); -#ifdef AST_XML_DOCS - ast_free(stringptmp); -#endif } AST_RWLIST_UNLOCK(&agi_commands); fprintf(htmlfile, "</TABLE>\n</BODY>\n</HTML>\n"); |