From b5cf54252ae6d7fb03743210be80949b620f7945 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 27 Jan 2021 12:16:55 +1100 Subject: [PATCH 1/2] Stop xmlFreeTextWriter being called twice xmlFreeTextWriter could be called twice if xmlDocDumpFormatMemoryEnc failed. --- bin/named/statschannel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index bb46479b64..d2cfc12bf5 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); From 95114f7d60cadf9c54349a92067159c04e5d0b26 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 27 Jan 2021 12:23:55 +1100 Subject: [PATCH 2/2] Add CHANGES entry for [GL #2420] --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index e8770530e3..44712112f0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5572. [bug] Address potential double free in generatexml. + [GL #2420] + 5571. [bug] If a zone had a non-builtin named allow-update acl named failed to start. [GL #2413]