17cf65
diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c
17cf65
--- a/parser/expat/lib/xmlparse.c
17cf65
+++ b/parser/expat/lib/xmlparse.c
17cf65
@@ -5652,12 +5652,18 @@
17cf65
   else
17cf65
 #endif /* XML_DTD */
17cf65
   {
17cf65
     processor = contentProcessor;
17cf65
     /* see externalEntityContentProcessor vs contentProcessor */
17cf65
-    return doContent(parser, parentParser ? 1 : 0, encoding, s, end,
17cf65
-                     nextPtr, (XML_Bool)!ps_finalBuffer);
17cf65
+    result = doContent(parser, parser->m_parentParser ? 1 : 0,
17cf65
+                       parser->m_encoding, s, end, nextPtr,
17cf65
+                       (XML_Bool)! parser->m_parsingStatus.finalBuffer);
17cf65
+    if (result == XML_ERROR_NONE) {
17cf65
+      if (! storeRawNames(parser))
17cf65
+        return XML_ERROR_NO_MEMORY;
17cf65
+    }
17cf65
+    return result;
17cf65
   }
17cf65
 }
17cf65
 
17cf65
 static enum XML_Error PTRCALL
17cf65
 errorProcessor(XML_Parser parser,
17cf65