diff options
Diffstat (limited to 'meta/recipes-core/libxml/libxml2')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2/72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch b/meta/recipes-core/libxml/libxml2/72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch new file mode 100644 index 0000000000..10a8112b58 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Veillard <veillard@redhat.com> | ||
3 | Date: Thu, 23 Oct 2014 11:35:36 +0800 | ||
4 | Subject: Fix missing entities after CVE-2014-3660 fix | ||
5 | |||
6 | For https://bugzilla.gnome.org/show_bug.cgi?id=738805 | ||
7 | |||
8 | The fix for CVE-2014-3660 introduced a regression in some case | ||
9 | where entity substitution is required and the entity is used | ||
10 | first in anotther entity referenced from an attribute value | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | diff --git a/parser.c b/parser.c | ||
15 | index 67c9dfd..a8d1b67 100644 | ||
16 | --- a/parser.c | ||
17 | +++ b/parser.c | ||
18 | @@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { | ||
19 | * far more secure as the parser will only process data coming from | ||
20 | * the document entity by default. | ||
21 | */ | ||
22 | - if ((ent->checked == 0) && | ||
23 | + if (((ent->checked == 0) || | ||
24 | + ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) && | ||
25 | ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) || | ||
26 | (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) { | ||
27 | unsigned long oldnbent = ctxt->nbentities; | ||
28 | -- | ||
29 | cgit v0.10.1 | ||
30 | |||