3586. [buf] Handle errors in xmlDocDumpFormatMemoryEnc. [RT #33706]

diff --git a/CHANGES b/CHANGES
index cf53b7b0cafaa7e02c86f8e79a0d5eb2697f1005..e3491ac0478eebe2be256e262b6250b6ea93b1af 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3586.  [buf]           Handle errors in xmlDocDumpFormatMemoryEnc. [RT #33706]
+
 3585.  [func]          "rndc delzone -clean" option removes zone files
                        when deleting a zone. [RT #33570]
 
@@ -40,7 +42,7 @@
                        [RT #33234]
 
 3570.  [bug]           Check internal pointers are valid when loading map
-                        files. [RT #33403]
+                       files. [RT #33403]
 
 3569.  [contrib]       Ported mysql DLZ driver to dynamically-loadable
                        module, and added multithread support. [RT #33394]
@@ -52,7 +54,7 @@
 
 3566.  [func]          Log when forwarding updates to master. [RT #33240]
 
-3565.   [placeholder]
+3565.  [placeholder]
 
 3564.  [bug]           Improved handling of corrupted map files. [RT #33380]
 
@@ -64,7 +66,7 @@
 
 3561.  [bug]           dig: issue a warning if an EDNS query returns FORMERR
                        or NOTIMP.  Adjust usage message. [RT #33363]
-                       
+
 3560.  [bug]           isc-config.sh did not honor includedir and libdir
                        when set via configure. [RT #33345]
 

diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index 466fdc12a24293e9c7d0ed5b432085c23a767f44..d3c74f937f1fea9273ebe63390d40f2028a36bdc 100644 (file)
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -1185,6 +1185,8 @@ generatexml(ns_server_t *server, int *buflen, xmlChar **buf) {
        xmlFreeTextWriter(writer);
 
        xmlDocDumpFormatMemoryEnc(doc, buf, buflen, "UTF-8", 0);
+       if (*buf == NULL)
+               goto error;
        xmlFreeDoc(doc);
        return (ISC_R_SUCCESS);
 
@@ -1211,7 +1213,7 @@ render_index(const char *url, const char *querystring, void *arg,
             isc_buffer_t *b, isc_httpdfree_t **freecb,
             void **freecb_args)
 {
-       unsigned char *msg;
+       unsigned char *msg = NULL;
        int msglen;
        ns_server_t *server = arg;
        isc_result_t result;