summaryrefslogtreecommitdiff
path: root/debian/patches/0055-Fix-missing-entities-after-CVE-2014-3660-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0055-Fix-missing-entities-after-CVE-2014-3660-fix.patch')
-rw-r--r--debian/patches/0055-Fix-missing-entities-after-CVE-2014-3660-fix.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/debian/patches/0055-Fix-missing-entities-after-CVE-2014-3660-fix.patch b/debian/patches/0055-Fix-missing-entities-after-CVE-2014-3660-fix.patch
deleted file mode 100644
index fc40734..0000000
--- a/debian/patches/0055-Fix-missing-entities-after-CVE-2014-3660-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
----
- parser.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/parser.c b/parser.c
-index b7f3c03..c187327 100644
---- a/parser.c
-+++ b/parser.c
-@@ -7230,7 +7230,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;