author | Petr Sumbera <petr.sumbera@oracle.com> |
Mon, 01 Dec 2014 03:19:59 -0800 | |
branch | s11u2-sru |
changeset 3511 | 6c4181f4ab42 |
permissions | -rw-r--r-- |
3511
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: upstream |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
Patch status: will be part of next version |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
From 72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 Mon Sep 17 00:00:00 2001 |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
From: Daniel Veillard <[email protected]> |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
Date: Thu, 23 Oct 2014 11:35:36 +0800 |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
Subject: Fix missing entities after CVE-2014-3660 fix |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
|
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
For https://bugzilla.gnome.org/show_bug.cgi?id=738805 |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
|
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
The fix for CVE-2014-3660 introduced a regression in some case |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
where entity substitution is required and the entity is used |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
first in anotther entity referenced from an attribute value |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
|
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
diff --git a/parser.c b/parser.c |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
index 67c9dfd..a8d1b67 100644 |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
--- a/parser.c |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+++ b/parser.c |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
* far more secure as the parser will only process data coming from |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
* the document entity by default. |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
*/ |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
- if ((ent->checked == 0) && |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
+ if (((ent->checked == 0) || |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
+ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) && |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) || |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
(ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) { |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
unsigned long oldnbent = ctxt->nbentities; |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
-- |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
cgit v0.10.1 |
6c4181f4ab42
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |