From: Mark Andrews <marka@isc.org>
Date: Wed, 27 Jan 2021 01:16:55 +0000 (+1100)
Subject: Stop xmlFreeTextWriter being called twice
X-Git-Tag: v9.17.10~15^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5cf54252ae6d7fb03743210be80949b620f7945;p=thirdparty%2Fbind9.git

Stop xmlFreeTextWriter being called twice

xmlFreeTextWriter could be called twice if xmlDocDumpFormatMemoryEnc
failed.
---

diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index bb46479b642..d2cfc12bf5c 100644
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -2336,12 +2336,12 @@ generatexml(named_server_t *server, uint32_t flags, int *buflen,
 	TRY0(xmlTextWriterEndElement(writer)); /* /statistics */
 	TRY0(xmlTextWriterEndDocument(writer));
 
-	xmlFreeTextWriter(writer);
-
 	xmlDocDumpFormatMemoryEnc(doc, buf, buflen, "UTF-8", 0);
 	if (*buf == NULL) {
 		goto cleanup;
 	}
+
+	xmlFreeTextWriter(writer);
 	xmlFreeDoc(doc);
 	return (ISC_R_SUCCESS);