| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Mon, 23 Jul 2012 03:17:23 -0500 | |
| branch | s11-sru |
| changeset 2313 | cee15dd34514 |
| permissions | -rw-r--r-- |
|
2313
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
This patch copied/pasted from this link: |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
http://git.gnome.org/browse/libxml2/patch/?id=5bd3c061823a8499b27422aee04ea20aae24f03e |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
---------------------------------------------------------------------- |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
From 5bd3c061823a8499b27422aee04ea20aae24f03e Mon Sep 17 00:00:00 2001 |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
From: Daniel Veillard <[email protected]> |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
Date: Fri, 16 Dec 2011 10:53:35 +0000 |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
Subject: Fix an allocation error when copying entities |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
|
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
--- |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
diff --git a/parser.c b/parser.c |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
index 4e5dcb9..c55e41d 100644 |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
--- a/parser.c |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+++ b/parser.c |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
@@ -2709,7 +2709,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
|
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
buffer[nbchars++] = '&'; |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) {
|
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
- growBuffer(buffer, XML_PARSER_BUFFER_SIZE); |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+ growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE); |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
} |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
for (;i > 0;i--) |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
buffer[nbchars++] = *cur++; |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
-- |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
cgit v0.9.0.2 |
|
cee15dd34514
7100337 Problem with library/libxml
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |