Changeset 148144 in webkit

Timestamp:

Apr 10, 2013, 3:45:35 PM (12 years ago)

Author:

ap@apple.com

Message:

<rdar://problem/13047266> External XML entities are not loaded with modern libxml2
​https://bugs.webkit.org/show_bug.cgi?id=114377

Reviewed by Darin Adler.

Covered by http/tests/security/xss-DENIED-xml-external-entity.xhtml when using
new enough libxml2.

• xml/parser/XMLDocumentParserLibxml2.cpp: (WebCore::switchToUTF16): Added a FIXME with an idea for improvement. (WebCore::XMLParserContext::createStringParser): Apply XML_PARSE_NOENT in a non-hacky way, so that the new libxml2 check doesn't fail. (WebCore::XMLParserContext::createMemoryParser): Updated an unhelpful and incorrect comment (XML_PARSE_NODICT actually means "Do not reuse the context dictionary").

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• xml/parser/XMLDocumentParserLibxml2.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-10  Alexey Proskuryakov  <ap@apple.com>
+
+        <rdar://problem/13047266> External XML entities are not loaded with modern libxml2
+        https://bugs.webkit.org/show_bug.cgi?id=114377
+
+        Reviewed by Darin Adler.
+
+        Covered by http/tests/security/xss-DENIED-xml-external-entity.xhtml when using
+        new enough libxml2.
+
+        * xml/parser/XMLDocumentParserLibxml2.cpp:
+        (WebCore::switchToUTF16): Added a FIXME with an idea for improvement.
+        (WebCore::XMLParserContext::createStringParser): Apply XML_PARSE_NOENT in a non-hacky
+        way, so that the new libxml2 check doesn't fail.
+        (WebCore::XMLParserContext::createMemoryParser): Updated an unhelpful and incorrect
+        comment (XML_PARSE_NODICT actually means "Do not reuse the context dictionary").
+
 2013-04-10  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp

@@ -381 +381 @@
     // will detect <?xml version="1.0" encoding="<encoding name>"?> blocks
     // and switch encodings, causing the parse to fail.
+
+    // FIXME: Can we just use XML_PARSE_IGNORE_ENC now?
+
     const UChar BOM = 0xFEFF;
     const unsigned char BOMHighByte = *reinterpret_cast<const unsigned char*>(&BOM);
@@ -500 +503 @@
     xmlParserCtxtPtr parser = xmlCreatePushParserCtxt(handlers, 0, 0, 0, 0);
     parser->_private = userData;
-    parser->replaceEntities = true;
+
+    // Substitute entities.
+    xmlCtxtUseOptions(parser, XML_PARSE_NOENT);
+
     switchToUTF16(parser);
 
@@ -524 +530 @@
         return 0;
 
-    // Copy the sax handler
     memcpy(parser->sax, handlers, sizeof(xmlSAXHandler));
 
-    // Set parser options.
-    // XML_PARSE_NODICT: default dictionary option.
-    // XML_PARSE_NOENT: force entities substitutions.
+    // Substitute entities.
+    // FIXME: Why is XML_PARSE_NODICT needed? This is different from what createStringParser does.
     xmlCtxtUseOptions(parser, XML_PARSE_NODICT | XML_PARSE_NOENT);