You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
1.0 KiB
27 lines
1.0 KiB
7 years ago
|
commit 27a93eff49526aacd34192258c19ff5d69d18c00
|
||
|
|
Author: Daniel Veillard <veillard@redhat.com>
|
||
|
|
Date: Thu Oct 23 11:35:36 2014 +0800
|
||
|
|
|
||
|
|
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 b58c2f0..f70d2b5 100644
|
||
|
|
--- a/parser.c
|
||
|
|
+++ b/parser.c
|
||
|
|
@@ -7226,7 +7226,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;
|