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