From ac9d521985e6bbd2fd68b9fa3c76213dc2b3f895 Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Fri, 20 Nov 2015 20:45:25 +0000 Subject: New release to fix a number of CVE's. CVE-2015-1819 is also listed in the release notes of 2.9.3 but that issue was fixed in a previous commit and documented in another vuxml entry. MFH: 2015Q4 Security: e5423caf-8fb8-11e5-918c-bcaec565249c --- textproc/libxml2/files/patch-parser.c | 45 ----------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 textproc/libxml2/files/patch-parser.c (limited to 'textproc/libxml2/files/patch-parser.c') diff --git a/textproc/libxml2/files/patch-parser.c b/textproc/libxml2/files/patch-parser.c deleted file mode 100644 index fb841d5ca932..000000000000 --- a/textproc/libxml2/files/patch-parser.c +++ /dev/null @@ -1,45 +0,0 @@ -From 72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard -Date: Thu, 23 Oct 2014 11:35:36 +0800 -Subject: Fix missing entities after CVE-2014-3660 fix - -For https://bugzilla.gnome.org/show_bug.cgi?id=738805 - -The fix for CVE-2014-3660 introduced a regression in some case -where entity substitution is required and the entity is used -first in anotther entity referenced from an attribute value - ---- - -From 0e6659ec960734b0b01aad196d4bdb4a3800b493 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Thu, 16 Oct 2014 19:10:59 +0200 -Subject: [PATCH] Revert "Missing initialization for the catalog module" - -It's not correct to always load the default catalog. -https://bugzilla.redhat.com/show_bug.cgi?id=1153753 - -This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7. - ---- parser.c.orig 2014-10-29 14:28:43.755327730 +0100 -+++ parser.c 2014-10-29 14:28:55.287325756 +0100 -@@ -7235,7 +7235,8 @@ - * far more secure as the parser will only process data coming from - * the document entity by default. - */ -- if ((ent->checked == 0) && -+ if (((ent->checked == 0) || -+ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) && - ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) || - (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) { - unsigned long oldnbent = ctxt->nbentities; -@@ -14830,9 +14831,6 @@ - #ifdef LIBXML_XPATH_ENABLED - xmlXPathInit(); - #endif --#ifdef LIBXML_CATALOG_ENABLED -- xmlInitializeCatalog(); --#endif - xmlParserInitialized = 1; - #ifdef LIBXML_THREAD_ENABLED - } -- cgit v1.2.3