diff --git a/build-scripts/libxml2.build b/build-scripts/libxml2.build index 88dfe7f..f838835 100644 --- a/build-scripts/libxml2.build +++ b/build-scripts/libxml2.build @@ -1,7 +1,7 @@ #! /bin/bash -# LibXML2 2.9.10 -# Source: http://xmlsoft.org/sources/libxml2-2.9.10.tar.gz +# LibXML2 2.9.12 +# Source: http://xmlsoft.org/sources/libxml2-2.9.12.tar.gz # # $BUILD = Directory to temporarily install # $PKGS = Directory to store built packages @@ -13,17 +13,8 @@ autoreconf -fvi && -patch -Np1 -i ../patches/libxml2-adelie/CVE-2019-20388.patch -patch -Np1 -i ../patches/libxml2-adelie/CVE-2020-7595.patch patch -Np1 -i ../patches/libxml2-adelie/python-segfault-fix.patch -# Prevent errors from Python 3.9 -sed -i '/if Py/{s/Py/(Py/;s/)/))/}' python/{types.c,libxml.c} -sed -i '/_PyVerify_fd/,+1d' python/types.c - -# If using ICU -# sed -i 's/ TRUE/ true/' encoding.c - rm python/setup.py ./configure --prefix=/usr \ @@ -64,6 +55,6 @@ libxml2: EOF sudo -S mv -v /tmp/slack-desc install/ && -sudo -S makepkg -l y -c n $PKGS/libxml2-2.9.10-$(uname -m)-mlfs.txz && +sudo -S makepkg -l y -c n $PKGS/libxml2-2.9.12-$(uname -m)-mlfs.txz && sudo -S rm -rf ${BUILD}/* diff --git a/patches/libxml2-adelie/CVE-2019-20388.patch b/patches/libxml2-adelie/CVE-2019-20388.patch deleted file mode 100644 index 49ff6fb..0000000 --- a/patches/libxml2-adelie/CVE-2019-20388.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 -From: Zhipeng Xie -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 ---- - xmlschemas.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/xmlschemas.c b/xmlschemas.c -index 301c8449..39d92182 100644 ---- a/xmlschemas.c -+++ b/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; --- -2.24.1 - diff --git a/patches/libxml2-adelie/CVE-2020-7595.patch b/patches/libxml2-adelie/CVE-2020-7595.patch deleted file mode 100644 index 3dd6774..0000000 --- a/patches/libxml2-adelie/CVE-2020-7595.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 -From: Zhipeng Xie -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 ---- - parser.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/parser.c b/parser.c -index d1c31963..a34bb6cd 100644 ---- a/parser.c -+++ b/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] == '#')) { --- -2.24.1 - diff --git a/patches/libxml2-void/CVE-2019-20388.patch b/patches/libxml2-void/CVE-2019-20388.patch deleted file mode 100644 index e1582f2..0000000 --- a/patches/libxml2-void/CVE-2019-20388.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6088a74bcf7d0c42e24cff4594d804e1d3c9fbca Mon Sep 17 00:00:00 2001 -From: Zhipeng Xie -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 ---- - xmlschemas.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/xmlschemas.c b/xmlschemas.c -index 301c8449..39d92182 100644 ---- xmlschemas.c -+++ 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; --- -2.24.1