diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2019-12-05 06:50:45 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2019-12-05 15:32:08 +0000 |
| commit | a60c92087e1bd3f9864e3243d57d4c3b611ec125 (patch) | |
| tree | 4eda099fd126f79221f30d15a4e1cf0ff2210d57 /chromium/third_party/libxml/src/include/libxml/encoding.h | |
| parent | dc7abb552a0a11be2e6b78c0229742a70e35330f (diff) | |
| download | qtwebengine-chromium-a60c92087e1bd3f9864e3243d57d4c3b611ec125.tar.gz | |
[Backport] Fix for CVE-2019-5815
Manual update.
Roll libxml, libxslt, that fixes a bug
libxslt fixed an issue with type confusion in xmlXPathNextPrecedingSibling.
R=dcheng@chromium.org
BUG=930663
Change-Id: Ib8055551b370c7d64957152e0fda57090110dee8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: Ic9b8f1d1639a1ef4058f805aa37f7a3c4c5ed4ed
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/libxml/src/include/libxml/encoding.h')
| -rw-r--r-- | chromium/third_party/libxml/src/include/libxml/encoding.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chromium/third_party/libxml/src/include/libxml/encoding.h b/chromium/third_party/libxml/src/include/libxml/encoding.h index 7967cc66a96..c875af6fb7c 100644 --- a/chromium/third_party/libxml/src/include/libxml/encoding.h +++ b/chromium/third_party/libxml/src/include/libxml/encoding.h @@ -129,9 +129,14 @@ typedef int (* xmlCharEncodingOutputFunc)(unsigned char *out, int *outlen, * If iconv is supported, there are two extra fields. */ #ifdef LIBXML_ICU_ENABLED +/* Size of pivot buffer, same as icu/source/common/ucnv.cpp CHUNK_SIZE */ +#define ICU_PIVOT_BUF_SIZE 1024 struct _uconv_t { UConverter *uconv; /* for conversion between an encoding and UTF-16 */ UConverter *utf8; /* for conversion between UTF-8 and UTF-16 */ + UChar pivot_buf[ICU_PIVOT_BUF_SIZE]; + UChar *pivot_source; + UChar *pivot_target; }; typedef struct _uconv_t uconv_t; #endif |