author | Petr Sumbera <petr.sumbera@oracle.com> |
Fri, 19 Jun 2015 06:22:15 -0700 | |
changeset 4532 | 0f27eb7ee42c |
permissions | -rw-r--r-- |
4532
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: upstream |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
Patch status: will be part of next version |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
https://git.gnome.org/browse/libxml2/commit/?id=213f1fe0d76d30eaed6e5853057defc43e6df2c9 |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
|
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
From 213f1fe0d76d30eaed6e5853057defc43e6df2c9 Mon Sep 17 00:00:00 2001 |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
From: Daniel Veillard <[email protected]> |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
Date: Tue, 14 Apr 2015 17:41:48 +0800 |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
Subject: CVE-2015-1819 Enforce the reader to run in constant memory |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
|
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
One of the operation on the reader could resolve entities |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
leading to the classic expansion issue. Make sure the |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
buffer used for xmlreader operation is bounded. |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
Introduce a new allocation type for the buffers for this effect. |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
|
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
diff --git a/buf.c b/buf.c |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
index 6efc7b6..07922ff 100644 |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
--- a/buf.c |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+++ b/buf.c |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
@@ -27,6 +27,7 @@ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
#include <libxml/tree.h> |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
#include <libxml/globals.h> |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
#include <libxml/tree.h> |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
+#include <libxml/parserInternals.h> /* for XML_MAX_TEXT_LENGTH */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
#include "buf.h" |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
|
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
#define WITH_BUFFER_COMPAT |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
@@ -299,7 +300,8 @@ xmlBufSetAllocationScheme(xmlBufPtr buf, |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
if ((scheme == XML_BUFFER_ALLOC_DOUBLEIT) || |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
(scheme == XML_BUFFER_ALLOC_EXACT) || |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
(scheme == XML_BUFFER_ALLOC_HYBRID) || |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
- (scheme == XML_BUFFER_ALLOC_IMMUTABLE)) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
+ (scheme == XML_BUFFER_ALLOC_IMMUTABLE) || |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |
+ (scheme == XML_BUFFER_ALLOC_BOUNDED)) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
buf->alloc = scheme; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
if (buf->buffer) |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
buf->buffer->alloc = scheme; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
@@ -458,6 +460,18 @@ xmlBufGrowInternal(xmlBufPtr buf, size_t len) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
39 |
size = buf->use + len + 100; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
40 |
#endif |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
41 |
|
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
42 |
+ if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
43 |
+ /* |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
44 |
+ * Used to provide parsing limits |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
45 |
+ */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
46 |
+ if ((buf->use + len >= XML_MAX_TEXT_LENGTH) || |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
47 |
+ (buf->size >= XML_MAX_TEXT_LENGTH)) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
48 |
+ xmlBufMemoryError(buf, "buffer error: text too long\n"); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
49 |
+ return(0); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
50 |
+ } |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
51 |
+ if (size >= XML_MAX_TEXT_LENGTH) |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
52 |
+ size = XML_MAX_TEXT_LENGTH; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
53 |
+ } |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
54 |
if ((buf->alloc == XML_BUFFER_ALLOC_IO) && (buf->contentIO != NULL)) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
55 |
size_t start_buf = buf->content - buf->contentIO; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
56 |
|
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
57 |
@@ -739,6 +753,15 @@ xmlBufResize(xmlBufPtr buf, size_t size) |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
58 |
CHECK_COMPAT(buf) |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
59 |
|
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
60 |
if (buf->alloc == XML_BUFFER_ALLOC_IMMUTABLE) return(0); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
61 |
+ if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
62 |
+ /* |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
63 |
+ * Used to provide parsing limits |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
64 |
+ */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
65 |
+ if (size >= XML_MAX_TEXT_LENGTH) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
66 |
+ xmlBufMemoryError(buf, "buffer error: text too long\n"); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
67 |
+ return(0); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
68 |
+ } |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
69 |
+ } |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
70 |
|
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
71 |
/* Don't resize if we don't have to */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
72 |
if (size < buf->size) |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
73 |
@@ -867,6 +890,15 @@ xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
74 |
|
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
75 |
needSize = buf->use + len + 2; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
76 |
if (needSize > buf->size){ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
77 |
+ if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
78 |
+ /* |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
79 |
+ * Used to provide parsing limits |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
80 |
+ */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
81 |
+ if (needSize >= XML_MAX_TEXT_LENGTH) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
82 |
+ xmlBufMemoryError(buf, "buffer error: text too long\n"); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
83 |
+ return(-1); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
84 |
+ } |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
85 |
+ } |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
86 |
if (!xmlBufResize(buf, needSize)){ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
87 |
xmlBufMemoryError(buf, "growing buffer"); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
88 |
return XML_ERR_NO_MEMORY; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
89 |
@@ -938,6 +970,15 @@ xmlBufAddHead(xmlBufPtr buf, const xmlChar *str, int len) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
90 |
} |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
91 |
needSize = buf->use + len + 2; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
92 |
if (needSize > buf->size){ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
93 |
+ if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
94 |
+ /* |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
95 |
+ * Used to provide parsing limits |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
96 |
+ */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
97 |
+ if (needSize >= XML_MAX_TEXT_LENGTH) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
98 |
+ xmlBufMemoryError(buf, "buffer error: text too long\n"); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
99 |
+ return(-1); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
100 |
+ } |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
101 |
+ } |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
102 |
if (!xmlBufResize(buf, needSize)){ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
103 |
xmlBufMemoryError(buf, "growing buffer"); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
104 |
return XML_ERR_NO_MEMORY; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
105 |
diff --git a/include/libxml/tree.h b/include/libxml/tree.h |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
106 |
index 2f90717..4a9b3bc 100644 |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
107 |
--- a/include/libxml/tree.h |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
108 |
+++ b/include/libxml/tree.h |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
109 |
@@ -76,7 +76,8 @@ typedef enum { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
110 |
XML_BUFFER_ALLOC_EXACT, /* grow only to the minimal size */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
111 |
XML_BUFFER_ALLOC_IMMUTABLE, /* immutable buffer */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
112 |
XML_BUFFER_ALLOC_IO, /* special allocation scheme used for I/O */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
113 |
- XML_BUFFER_ALLOC_HYBRID /* exact up to a threshold, and doubleit thereafter */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
114 |
+ XML_BUFFER_ALLOC_HYBRID, /* exact up to a threshold, and doubleit thereafter */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
115 |
+ XML_BUFFER_ALLOC_BOUNDED /* limit the upper size of the buffer */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
116 |
} xmlBufferAllocationScheme; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
117 |
|
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
118 |
/** |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
119 |
diff --git a/xmlreader.c b/xmlreader.c |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
120 |
index f19e123..471e7e2 100644 |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
121 |
--- a/xmlreader.c |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
122 |
+++ b/xmlreader.c |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
123 |
@@ -2091,6 +2091,9 @@ xmlNewTextReader(xmlParserInputBufferPtr input, const char *URI) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
124 |
"xmlNewTextReader : malloc failed\n"); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
125 |
return(NULL); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
126 |
} |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
127 |
+ /* no operation on a reader should require a huge buffer */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
128 |
+ xmlBufSetAllocationScheme(ret->buffer, |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
129 |
+ XML_BUFFER_ALLOC_BOUNDED); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
130 |
ret->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler)); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
131 |
if (ret->sax == NULL) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
132 |
xmlBufFree(ret->buffer); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
133 |
@@ -3616,6 +3619,7 @@ xmlTextReaderConstValue(xmlTextReaderPtr reader) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
134 |
return(((xmlNsPtr) node)->href); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
135 |
case XML_ATTRIBUTE_NODE:{ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
136 |
xmlAttrPtr attr = (xmlAttrPtr) node; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
137 |
+ const xmlChar *ret; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
138 |
|
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
139 |
if ((attr->children != NULL) && |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
140 |
(attr->children->type == XML_TEXT_NODE) && |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
141 |
@@ -3629,10 +3633,21 @@ xmlTextReaderConstValue(xmlTextReaderPtr reader) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
142 |
"xmlTextReaderSetup : malloc failed\n"); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
143 |
return (NULL); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
144 |
} |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
145 |
+ xmlBufSetAllocationScheme(reader->buffer, |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
146 |
+ XML_BUFFER_ALLOC_BOUNDED); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
147 |
} else |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
148 |
xmlBufEmpty(reader->buffer); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
149 |
xmlBufGetNodeContent(reader->buffer, node); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
150 |
- return(xmlBufContent(reader->buffer)); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
151 |
+ ret = xmlBufContent(reader->buffer); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
152 |
+ if (ret == NULL) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
153 |
+ /* error on the buffer best to reallocate */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
154 |
+ xmlBufFree(reader->buffer); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
155 |
+ reader->buffer = xmlBufCreateSize(100); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
156 |
+ xmlBufSetAllocationScheme(reader->buffer, |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
157 |
+ XML_BUFFER_ALLOC_BOUNDED); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
158 |
+ ret = BAD_CAST ""; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
159 |
+ } |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
160 |
+ return(ret); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
161 |
} |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
162 |
break; |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
163 |
} |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
164 |
@@ -5131,6 +5146,9 @@ xmlTextReaderSetup(xmlTextReaderPtr reader, |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
165 |
"xmlTextReaderSetup : malloc failed\n"); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
166 |
return (-1); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
167 |
} |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
168 |
+ /* no operation on a reader should require a huge buffer */ |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
169 |
+ xmlBufSetAllocationScheme(reader->buffer, |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
170 |
+ XML_BUFFER_ALLOC_BOUNDED); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
171 |
if (reader->sax == NULL) |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
172 |
reader->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler)); |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
173 |
if (reader->sax == NULL) { |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
174 |
-- |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
175 |
cgit v0.10.2 |
0f27eb7ee42c
20912540 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
176 |