--- /third_party/blink/renderer/core/xml/parser/xml_document_parser.cc +++ /third_party/blink/renderer/core/xml/parser/xml_document_parser.cc @@ -28,6 +28,10 @@ #include #include +#include +#if defined(LIBXML_CATALOG_ENABLED) +#include +#endif #include #include @@ -538,10 +542,6 @@ static bool ShouldAllowExternalLoad(const KURL& url) { String url_string = url.GetString(); - // libxml should not be configured with catalogs enabled, so it - // should not be asking to load default catalogs. - CHECK(!IsLibxmlDefaultCatalogFile(url)); - // The most common DTD. There isn't much point in hammering www.w3c.org by // requesting this URL for every XHTML document. if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml")) @@ -648,6 +648,9 @@ if (did_init) return; +#if defined(LIBXML_CATALOG_ENABLED) + xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE); +#endif xmlInitParser(); xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc); xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);