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