diff options
author | Britney Fransen <brfransen@gmail.com> | 2014-12-02 14:03:34 (GMT) |
---|---|---|
committer | Britney Fransen <brfransen@gmail.com> | 2014-12-02 14:03:34 (GMT) |
commit | a8d0b113aee5bfe33ff1f37be2d15dabe74f2b81 (patch) | |
tree | cca7991bfbd4b2f90b3c060fdb6c4db03b94143d /abs/core/libxml2/fix-CVE-2014-3660.patch | |
parent | cab981e025edb64271d2d01f0e955163c46bae61 (diff) | |
download | linhes_pkgbuild-a8d0b113aee5bfe33ff1f37be2d15dabe74f2b81.zip linhes_pkgbuild-a8d0b113aee5bfe33ff1f37be2d15dabe74f2b81.tar.gz linhes_pkgbuild-a8d0b113aee5bfe33ff1f37be2d15dabe74f2b81.tar.bz2 |
libxml2: update to 2.9.2
Diffstat (limited to 'abs/core/libxml2/fix-CVE-2014-3660.patch')
-rw-r--r-- | abs/core/libxml2/fix-CVE-2014-3660.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/abs/core/libxml2/fix-CVE-2014-3660.patch b/abs/core/libxml2/fix-CVE-2014-3660.patch new file mode 100644 index 0000000..9e6441c --- /dev/null +++ b/abs/core/libxml2/fix-CVE-2014-3660.patch @@ -0,0 +1,28 @@ +From 72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard@redhat.com> +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 + +diff --git a/parser.c b/parser.c +index 67c9dfd..a8d1b67 100644 +--- a/parser.c ++++ b/parser.c +@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { + * 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; +-- +cgit v0.10.1 + |