The previous fix should also be applied to XML_ParserReset.

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 9deaec239d2bbabc64b45b01c774e66b3646abbf..68a0f29e124b57d3e79b0731906d606d86e04b2a 100644 (file)
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -809,10 +809,10 @@ XML_ParserReset(XML_Parser parser, const XML_Char *encodingName)
     FREE(unknownEncodingMem);
   if (unknownEncodingRelease)
     unknownEncodingRelease(unknownEncodingData);
-  parserInit(parser, encodingName);
-  dtdReset(&dtd, parser);
   poolClear(&tempPool);
   poolClear(&temp2Pool);
+  parserInit(parser, encodingName);
+  dtdReset(&dtd, parser);
   return XML_TRUE;
 }
 
@@ -5229,11 +5229,11 @@ hashTableIterNext(HASH_TABLE_ITER *iter)
 static void
 poolInit(STRING_POOL *pool, XML_Memory_Handling_Suite *ms)
 {
-  pool->blocks = 0;
-  pool->freeBlocks = 0;
-  pool->start = 0;
-  pool->ptr = 0;
-  pool->end = 0;
+  pool->blocks = NULL;
+  pool->freeBlocks = NULL;
+  pool->start = NULL;
+  pool->ptr = NULL;
+  pool->end = NULL;
   pool->mem = ms;
 }