diff options
author | Mike Gilbert <floppym@gentoo.org> | 2018-06-16 15:33:58 -0400 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2018-06-16 15:34:11 -0400 |
commit | 4f14cecc16899c822f3bc0eae536c80b0b62888b (patch) | |
tree | 8b7b7d0e504df62880945300256b4cdcecb5b48a /www-client/chromium/files | |
parent | media-gfx/fontforge: Add missing dependency on glib (diff) | |
download | gentoo-4f14cecc16899c822f3bc0eae536c80b0b62888b.tar.gz gentoo-4f14cecc16899c822f3bc0eae536c80b0b62888b.tar.bz2 gentoo-4f14cecc16899c822f3bc0eae536c80b0b62888b.zip |
www-client/chromium: disable xml catalogs
Bug: https://bugs.gentoo.org/653078
Package-Manager: Portage-2.3.40_p14, Repoman-2.3.9_p246
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r-- | www-client/chromium/files/chromium-disable_xml_catalogs.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-disable_xml_catalogs.patch b/www-client/chromium/files/chromium-disable_xml_catalogs.patch new file mode 100644 index 000000000000..7aff36c782a3 --- /dev/null +++ b/www-client/chromium/files/chromium-disable_xml_catalogs.patch @@ -0,0 +1,34 @@ +--- a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc ++++ b/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc +@@ -28,6 +28,10 @@ + + #include <libxml/parser.h> + #include <libxml/parserInternals.h> ++#include <libxml/xmlversion.h> ++#if defined(LIBXML_CATALOG_ENABLED) ++#include <libxml/catalog.h> ++#endif + #include <libxslt/xslt.h> + + #include <memory> +@@ -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); |