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

(cherry picked from commit 7ee225cf90)
This commit is contained in:
Mark Andrews
2013-06-06 10:55:08 +10:00
parent e019b0ea9b
commit 6232249e0c
2 changed files with 5 additions and 1 deletions

View File

@@ -1,3 +1,5 @@
3586. [buf] Handle errors in xmlDocDumpFormatMemoryEnc. [RT #33706]
3584. [security] Caching data from an incompletely signed zone could
trigger an assertion failure in resolver.c [RT #33690]

View File

@@ -955,6 +955,8 @@ generatexml(ns_server_t *server, int *buflen, xmlChar **buf) {
xmlFreeTextWriter(writer);
xmlDocDumpFormatMemoryEnc(doc, buf, buflen, "UTF-8", 1);
if (*buf == NULL)
goto error;
xmlFreeDoc(doc);
return (ISC_R_SUCCESS);
@@ -979,7 +981,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;