This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 93fd6e3d0303e4fbbeebabb414bf61c18e06280c
Author: Don Lewis <truck...@apache.org>
AuthorDate: Tue Sep 29 21:13:27 2020 -0700
libxml2 bug fixes from upstream
From: Zhipeng Xie <xiezhipe...@huawei.com>
Date: Thu, 12 Dec 2019 17:30:55 +0800
Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities
When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef
return NULL which cause a infinite loop in xmlStringLenDecodeEntities
Found with libFuzzer.
From: Nick Wellnhofer <wellnho...@aevum.de>
Date: Fri, 7 Aug 2020 21:54:27 +0200
Subject: [PATCH] Fix out-of-bounds read with 'xmllint --htmlout'
Make sure that truncated UTF-8 sequences don't cause an out-of-bounds
array access.
Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for
the report.
Fixes #178.
From: Zhipeng Xie <xiezhipe...@huawei.com>
Date: Tue, 20 Aug 2019 16:33:06 +0800
Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream
When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun
alloc a new schema for ctxt->schema and set vctxt->xsiAssemble
to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize
vctxt->xsiAssemble to 0 again which cause the alloced schema
can not be freed anymore.
Found with libFuzzer.
Patch by: Zhipeng Xie <xiezhipe...@huawei.com> via gnome.org
Patch by: Nick Wellnhofer <wellnho...@aevum.de> via gnome.org
---
.../0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch | 32 +++++++++++++++++++
.../50f06b3efb638efb0abd95dc62dca05ae67882c2.patch | 36 ++++++++++++++++++++++
.../7ffcd44d7e6c46704f8af0321d9314cd26e0e18a.patch | 33 ++++++++++++++++++++
main/libxml2/makefile.mk | 5 ++-
4 files changed, 105 insertions(+), 1 deletion(-)
diff --git a/main/libxml2/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch
b/main/libxml2/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch
new file mode 100644
index 0000000..a356734
--- /dev/null
+++ b/main/libxml2/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch
@@ -0,0 +1,32 @@
+From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001
+From: Zhipeng Xie <xiezhipe...@huawei.com>
+Date: Thu, 12 Dec 2019 17:30:55 +0800
+Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities
+
+When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef
+return NULL which cause a infinite loop in xmlStringLenDecodeEntities
+
+Found with libFuzzer.
+
+Signed-off-by: Zhipeng Xie <xiezhipe...@huawei.com>
+---
+ parser.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git misc/libxml2-2.9.10/parser.c misc/build/libxml2-2.9.10/parser.c
+index d1c319631..a34bb6cdd 100644
+--- misc/libxml2-2.9.10/parser.c
++++ misc/build/libxml2-2.9.10/parser.c
+@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const
xmlChar *str, int len,
+ else
+ c = 0;
+ while ((c != 0) && (c != end) && /* non input consuming loop */
+- (c != end2) && (c != end3)) {
++ (c != end2) && (c != end3) &&
++ (ctxt->instate != XML_PARSER_EOF)) {
+
+ if (c == 0) break;
+ if ((c == '&') && (str[1] == '#')) {
+--
+GitLab
+
diff --git a/main/libxml2/50f06b3efb638efb0abd95dc62dca05ae67882c2.patch
b/main/libxml2/50f06b3efb638efb0abd95dc62dca05ae67882c2.patch
new file mode 100644
index 0000000..3585b4e
--- /dev/null
+++ b/main/libxml2/50f06b3efb638efb0abd95dc62dca05ae67882c2.patch
@@ -0,0 +1,36 @@
+From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnho...@aevum.de>
+Date: Fri, 7 Aug 2020 21:54:27 +0200
+Subject: [PATCH] Fix out-of-bounds read with 'xmllint --htmlout'
+
+Make sure that truncated UTF-8 sequences don't cause an out-of-bounds
+array access.
+
+Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for
+the report.
+
+Fixes #178.
+---
+ xmllint.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git misc/libxml2-2.9.10/xmllint.c misc/build/libxml2-2.9.10/xmllint.c
+index f6a8e4636..c647486f3 100644
+--- misc/libxml2-2.9.10/xmllint.c
++++ misc/build/libxml2-2.9.10/xmllint.c
+@@ -528,6 +528,12 @@ static void
+ xmlHTMLEncodeSend(void) {
+ char *result;
+
++ /*
++ * xmlEncodeEntitiesReentrant assumes valid UTF-8, but the buffer might
++ * end with a truncated UTF-8 sequence. This is a hack to at least avoid
++ * an out-of-bounds read.
++ */
++ memset(&buffer[sizeof(buffer)-4], 0, 4);
+ result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer);
+ if (result) {
+ xmlGenericError(xmlGenericErrorContext, "%s", result);
+--
+GitLab
+
diff --git a/main/libxml2/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a.patch
b/main/libxml2/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a.patch
new file mode 100644
index 0000000..c8f1446
--- /dev/null
+++ b/main/libxml2/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a.patch
@@ -0,0 +1,33 @@
+From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001
+From: Zhipeng Xie <xiezhipe...@huawei.com>
+Date: Tue, 20 Aug 2019 16:33:06 +0800
+Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream
+
+When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun
+alloc a new schema for ctxt->schema and set vctxt->xsiAssemble
+to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize
+vctxt->xsiAssemble to 0 again which cause the alloced schema
+can not be freed anymore.
+
+Found with libFuzzer.
+
+Signed-off-by: Zhipeng Xie <xiezhipe...@huawei.com>
+---
+ xmlschemas.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git misc/libxml2-2.9.10/xmlschemas.c
misc/build/libxml2-2.9.10/xmlschemas.c
+index 301c84499..39d92182f 100644
+--- misc/libxml2-2.9.10/xmlschemas.c
++++ misc/build/libxml2-2.9.10/xmlschemas.c
+@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) {
+ vctxt->nberrors = 0;
+ vctxt->depth = -1;
+ vctxt->skipDepth = -1;
+- vctxt->xsiAssemble = 0;
+ vctxt->hasKeyrefs = 0;
+ #ifdef ENABLE_IDC_NODE_TABLES_TEST
+ vctxt->createIDCNodeTables = 1;
+--
+GitLab
+
diff --git a/main/libxml2/makefile.mk b/main/libxml2/makefile.mk
index be13d7a..d4ae653 100644
--- a/main/libxml2/makefile.mk
+++ b/main/libxml2/makefile.mk
@@ -43,7 +43,10 @@ LIBXML2VERSION=2.9.10
TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
TARFILE_MD5=10942a1dc23137a8aa07f0639cbfece5
-PATCH_FILES=libxml2-configure.patch
+PATCH_FILES=libxml2-configure.patch \
+ 0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch \
+ 50f06b3efb638efb0abd95dc62dca05ae67882c2.patch \
+ 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a.patch
# libxml2-global-symbols: #i112480#: Solaris ld won't export non-listed symbols
# libxml2-global-symbols.patch
