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