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