diff options
author | Daniel Veillard <veillard@redhat.com> | 2014-10-23 11:35:36 +0800 |
---|---|---|
committer | Daniel Veillard <veillard@redhat.com> | 2014-10-23 11:35:36 +0800 |
commit | 72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 (patch) | |
tree | 997564d7843d645ef2d0af6b5e11085c213e7103 /parser.c | |
parent | f65128f38289d77ff322d63aef2858cc0a819c34 (diff) | |
download | android_external_libxml2-72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.tar.gz android_external_libxml2-72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.tar.bz2 android_external_libxml2-72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.zip |
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
Diffstat (limited to 'parser.c')
-rw-r--r-- | parser.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; |