[arch-commits] Commit in libxml2/repos/staging-x86_64 (15 files)
Jan de Groot
jgc at archlinux.org
Wed Nov 11 15:13:05 UTC 2020
Date: Wednesday, November 11, 2020 @ 15:13:05
Author: jgc
Revision: 400394
archrelease: copy trunk to staging-x86_64
Added:
libxml2/repos/staging-x86_64/PKGBUILD
(from rev 400393, libxml2/trunk/PKGBUILD)
libxml2/repos/staging-x86_64/fix-relaxed-approach-to-nested-documents.patch
(from rev 400393, libxml2/trunk/fix-relaxed-approach-to-nested-documents.patch)
libxml2/repos/staging-x86_64/libxml2-2.9.10-CVE-2019-20388.patch
(from rev 400393, libxml2/trunk/libxml2-2.9.10-CVE-2019-20388.patch)
libxml2/repos/staging-x86_64/libxml2-2.9.10-CVE-2020-24977.patch
(from rev 400393, libxml2/trunk/libxml2-2.9.10-CVE-2020-24977.patch)
libxml2/repos/staging-x86_64/libxml2-2.9.10-CVE-2020-7595.patch
(from rev 400393, libxml2/trunk/libxml2-2.9.10-CVE-2020-7595.patch)
libxml2/repos/staging-x86_64/libxml2-2.9.10-fix-integer-overflow.patch
(from rev 400393, libxml2/trunk/libxml2-2.9.10-fix-integer-overflow.patch)
libxml2/repos/staging-x86_64/libxml2-2.9.10-parenthesize-type-checks.patch
(from rev 400393, libxml2/trunk/libxml2-2.9.10-parenthesize-type-checks.patch)
libxml2/repos/staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch
(from rev 400393, libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch)
Deleted:
libxml2/repos/staging-x86_64/PKGBUILD
libxml2/repos/staging-x86_64/fix-relaxed-approach-to-nested-documents.patch
libxml2/repos/staging-x86_64/libxml2-2.9.10-CVE-2019-20388.patch
libxml2/repos/staging-x86_64/libxml2-2.9.10-CVE-2020-24977.patch
libxml2/repos/staging-x86_64/libxml2-2.9.10-CVE-2020-7595.patch
libxml2/repos/staging-x86_64/libxml2-2.9.10-parenthesize-type-checks.patch
libxml2/repos/staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch
------------------------------------------------+
PKGBUILD | 181 +++++++++++-----------
fix-relaxed-approach-to-nested-documents.patch | 66 ++++----
libxml2-2.9.10-CVE-2019-20388.patch | 66 ++++----
libxml2-2.9.10-CVE-2020-24977.patch | 77 ++++-----
libxml2-2.9.10-CVE-2020-7595.patch | 64 ++++----
libxml2-2.9.10-fix-integer-overflow.patch | 41 +++++
libxml2-2.9.10-parenthesize-type-checks.patch | 184 +++++++++++------------
libxml2-2.9.8-python3-unicode-errors.patch | 68 ++++----
8 files changed, 393 insertions(+), 354 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-11-11 15:13:00 UTC (rev 400393)
+++ PKGBUILD 2020-11-11 15:13:05 UTC (rev 400394)
@@ -1,89 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Tom Gundersen <teg at jklm.no>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgname=libxml2
-pkgver=2.9.10
-pkgrel=5
-pkgdesc='XML parsing library, version 2'
-url='http://www.xmlsoft.org/'
-arch=(x86_64)
-license=(MIT)
-depends=(zlib readline ncurses xz icu)
-makedepends=(python2 python git)
-_commit=41a34e1f4ffae2ce401600dbb5fe43f8fe402641 # tags/v2.9.10^0
-source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
- libxml2-2.9.8-python3-unicode-errors.patch
- fix-relaxed-approach-to-nested-documents.patch
- libxml2-2.9.10-CVE-2019-20388.patch
- libxml2-2.9.10-CVE-2020-7595.patch
- libxml2-2.9.10-parenthesize-type-checks.patch
- libxml2-2.9.10-CVE-2020-24977.patch
- https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
-sha256sums=('SKIP'
- '37eb81a8ec6929eed1514e891bff2dd05b450bcf0c712153880c485b7366c17c'
- '50f04807b86a179d051fb86755e82f55ba7aac9d0c005eefea93d2599a911d01'
- 'cfe1b3e0f026df6f979dbd77c1dcd1268e60acf3d7a8ff3f480b4e67bfcc19d6'
- 'c6105ff40d7b1b140fcd821b5d64ab8c7b596708071c26964727e7352b07ac7e'
- 'b63c161e4c8a6f0a65ba091c3d3ed09d3110d21f997ee61077c782b311fd4b33'
- 'fd227780ad5699bebca7ef412d2d50fb1d21a54f6e3fdcad0bda5bdc8f8b2525'
- '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
-
-pkgver() {
- cd $pkgname
- git describe --always --tags | sed 's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
- mkdir build-py{2,3}
- cd $pkgname
-
- # From https://src.fedoraproject.org/rpms/libxml2/tree/master
- patch -Np1 -i ../libxml2-2.9.8-python3-unicode-errors.patch
- patch -Np1 -i ../fix-relaxed-approach-to-nested-documents.patch
- patch -Np1 -i ../libxml2-2.9.10-CVE-2019-20388.patch
- patch -Np1 -i ../libxml2-2.9.10-CVE-2020-7595.patch
- patch -Np1 -i ../libxml2-2.9.10-parenthesize-type-checks.patch
- patch -Np1 -i ../libxml2-2.9.10-CVE-2020-24977.patch
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-_build() (
- cd build-py$1
- ../$pkgname/configure \
- --prefix=/usr \
- --with-threads \
- --with-history \
- --with-python=/usr/bin/python$1 \
- --with-icu
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
- PYTHONHASHSEED=0 make
- find doc -type f -exec chmod 0644 {} +
-)
-
-build() {
- _build 2
- _build 3
-}
-
-check() {
- cd build-py2
- ln -s ../xmlconf
- make check
-}
-
-package() {
- make -C build-py2 DESTDIR="$pkgdir" install
- make -C build-py3/python DESTDIR="$pkgdir" install
- install -Dm 644 build-py2/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
-
- #Disabled for now, as I don't want to introduce file conflicts during a security update
- #python2 -m compileall -d /usr/lib/python2.7 "$pkgdir/usr/lib/python2.7"
- #python2 -O -m compileall -d /usr/lib/python2.7 "$pkgdir/usr/lib/python2.7"
- #python -m compileall -d /usr/lib/python3.9 "$pkgdir/usr/lib/python3.9"
- #python -O -m compileall -d /usr/lib/python3.9 "$pkgdir/usr/lib/python3.9"
-}
-
-# vim: ts=2 sw=2 et:
Copied: libxml2/repos/staging-x86_64/PKGBUILD (from rev 400393, libxml2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-11-11 15:13:05 UTC (rev 400394)
@@ -0,0 +1,92 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=libxml2
+pkgver=2.9.10
+pkgrel=7
+pkgdesc='XML parsing library, version 2'
+url='http://www.xmlsoft.org/'
+arch=(x86_64)
+license=(MIT)
+depends=(zlib readline ncurses xz icu)
+makedepends=(python2 python git)
+_commit=41a34e1f4ffae2ce401600dbb5fe43f8fe402641 # tags/v2.9.10^0
+source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
+ libxml2-2.9.8-python3-unicode-errors.patch
+ fix-relaxed-approach-to-nested-documents.patch
+ libxml2-2.9.10-CVE-2019-20388.patch
+ libxml2-2.9.10-CVE-2020-7595.patch
+ libxml2-2.9.10-parenthesize-type-checks.patch
+ libxml2-2.9.10-CVE-2020-24977.patch
+ libxml2-2.9.10-fix-integer-overflow.patch
+ https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
+sha256sums=('SKIP'
+ '37eb81a8ec6929eed1514e891bff2dd05b450bcf0c712153880c485b7366c17c'
+ '50f04807b86a179d051fb86755e82f55ba7aac9d0c005eefea93d2599a911d01'
+ 'cfe1b3e0f026df6f979dbd77c1dcd1268e60acf3d7a8ff3f480b4e67bfcc19d6'
+ 'c6105ff40d7b1b140fcd821b5d64ab8c7b596708071c26964727e7352b07ac7e'
+ 'b63c161e4c8a6f0a65ba091c3d3ed09d3110d21f997ee61077c782b311fd4b33'
+ '62eafffc2b4949489c261c63883d27c2e83d688f1d4c899000b283e4c2a682be'
+ 'fd227780ad5699bebca7ef412d2d50fb1d21a54f6e3fdcad0bda5bdc8f8b2525'
+ '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
+
+pkgver() {
+ cd $pkgname
+ git describe --always --tags | sed 's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+ mkdir build-py{2,3}
+ cd $pkgname
+
+ # From https://src.fedoraproject.org/rpms/libxml2/tree/master
+ patch -Np1 -i ../libxml2-2.9.8-python3-unicode-errors.patch
+ patch -Np1 -i ../fix-relaxed-approach-to-nested-documents.patch
+ patch -Np1 -i ../libxml2-2.9.10-CVE-2019-20388.patch
+ patch -Np1 -i ../libxml2-2.9.10-CVE-2020-7595.patch
+ patch -Np1 -i ../libxml2-2.9.10-parenthesize-type-checks.patch
+ patch -Np1 -i ../libxml2-2.9.10-CVE-2020-24977.patch
+ patch -Np1 -i ../libxml2-2.9.10-fix-integer-overflow.patch
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+_build() (
+ cd build-py$1
+ ../$pkgname/configure \
+ --prefix=/usr \
+ --with-threads \
+ --with-history \
+ --with-python=/usr/bin/python$1 \
+ --with-icu
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+ PYTHONHASHSEED=0 make
+ find doc -type f -exec chmod 0644 {} +
+)
+
+build() {
+ _build 2
+ _build 3
+}
+
+check() {
+ cd build-py2
+ ln -s ../xmlconf
+ make check
+}
+
+package() {
+ make -C build-py2 DESTDIR="$pkgdir" install
+ make -C build-py3/python DESTDIR="$pkgdir" install
+ install -Dm 644 build-py2/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
+
+ #Disabled for now, as I don't want to introduce file conflicts during a security update
+ #python2 -m compileall -d /usr/lib/python2.7 "$pkgdir/usr/lib/python2.7"
+ #python2 -O -m compileall -d /usr/lib/python2.7 "$pkgdir/usr/lib/python2.7"
+ #python -m compileall -d /usr/lib/python3.9 "$pkgdir/usr/lib/python3.9"
+ #python -O -m compileall -d /usr/lib/python3.9 "$pkgdir/usr/lib/python3.9"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: fix-relaxed-approach-to-nested-documents.patch
===================================================================
--- fix-relaxed-approach-to-nested-documents.patch 2020-11-11 15:13:00 UTC (rev 400393)
+++ fix-relaxed-approach-to-nested-documents.patch 2020-11-11 15:13:05 UTC (rev 400394)
@@ -1,33 +0,0 @@
-From 0815302dee2b78139832c2080348086a0564836b Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer at aevum.de>
-Date: Fri, 6 Dec 2019 12:27:29 +0100
-Subject: [PATCH] Fix freeing of nested documents
-
-Apparently, some libxslt RVTs can contain nested document nodes, see
-issue #132. I'm not sure how this happens exactly but it can cause a
-segfault in xmlFreeNodeList after the changes in commit 0762c9b6.
-
-Make sure not to touch the (nonexistent) `content` member of xmlDocs.
----
- tree.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tree.c b/tree.c
-index 070670f1..0d7fc98c 100644
---- a/tree.c
-+++ b/tree.c
-@@ -3708,6 +3708,11 @@ xmlFreeNodeList(xmlNodePtr cur) {
- (cur->type != XML_XINCLUDE_START) &&
- (cur->type != XML_XINCLUDE_END) &&
- (cur->type != XML_ENTITY_REF_NODE) &&
-+ (cur->type != XML_DOCUMENT_NODE) &&
-+#ifdef LIBXML_DOCB_ENABLED
-+ (cur->type != XML_DOCB_DOCUMENT_NODE) &&
-+#endif
-+ (cur->type != XML_HTML_DOCUMENT_NODE) &&
- (cur->content != (xmlChar *) &(cur->properties))) {
- DICT_FREE(cur->content)
- }
---
-2.22.0
-
Copied: libxml2/repos/staging-x86_64/fix-relaxed-approach-to-nested-documents.patch (from rev 400393, libxml2/trunk/fix-relaxed-approach-to-nested-documents.patch)
===================================================================
--- fix-relaxed-approach-to-nested-documents.patch (rev 0)
+++ fix-relaxed-approach-to-nested-documents.patch 2020-11-11 15:13:05 UTC (rev 400394)
@@ -0,0 +1,33 @@
+From 0815302dee2b78139832c2080348086a0564836b Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer at aevum.de>
+Date: Fri, 6 Dec 2019 12:27:29 +0100
+Subject: [PATCH] Fix freeing of nested documents
+
+Apparently, some libxslt RVTs can contain nested document nodes, see
+issue #132. I'm not sure how this happens exactly but it can cause a
+segfault in xmlFreeNodeList after the changes in commit 0762c9b6.
+
+Make sure not to touch the (nonexistent) `content` member of xmlDocs.
+---
+ tree.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tree.c b/tree.c
+index 070670f1..0d7fc98c 100644
+--- a/tree.c
++++ b/tree.c
+@@ -3708,6 +3708,11 @@ xmlFreeNodeList(xmlNodePtr cur) {
+ (cur->type != XML_XINCLUDE_START) &&
+ (cur->type != XML_XINCLUDE_END) &&
+ (cur->type != XML_ENTITY_REF_NODE) &&
++ (cur->type != XML_DOCUMENT_NODE) &&
++#ifdef LIBXML_DOCB_ENABLED
++ (cur->type != XML_DOCB_DOCUMENT_NODE) &&
++#endif
++ (cur->type != XML_HTML_DOCUMENT_NODE) &&
+ (cur->content != (xmlChar *) &(cur->properties))) {
+ DICT_FREE(cur->content)
+ }
+--
+2.22.0
+
Deleted: libxml2-2.9.10-CVE-2019-20388.patch
===================================================================
--- libxml2-2.9.10-CVE-2019-20388.patch 2020-11-11 15:13:00 UTC (rev 400393)
+++ libxml2-2.9.10-CVE-2019-20388.patch 2020-11-11 15:13:05 UTC (rev 400394)
@@ -1,33 +0,0 @@
-From 6088a74bcf7d0c42e24cff4594d804e1d3c9fbca Mon Sep 17 00:00:00 2001
-From: Zhipeng Xie <xiezhipeng1 at 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 <xiezhipeng1 at huawei.com>
----
- 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
-
Copied: libxml2/repos/staging-x86_64/libxml2-2.9.10-CVE-2019-20388.patch (from rev 400393, libxml2/trunk/libxml2-2.9.10-CVE-2019-20388.patch)
===================================================================
--- libxml2-2.9.10-CVE-2019-20388.patch (rev 0)
+++ libxml2-2.9.10-CVE-2019-20388.patch 2020-11-11 15:13:05 UTC (rev 400394)
@@ -0,0 +1,33 @@
+From 6088a74bcf7d0c42e24cff4594d804e1d3c9fbca Mon Sep 17 00:00:00 2001
+From: Zhipeng Xie <xiezhipeng1 at 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 <xiezhipeng1 at huawei.com>
+---
+ 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
+
Deleted: libxml2-2.9.10-CVE-2020-24977.patch
===================================================================
--- libxml2-2.9.10-CVE-2020-24977.patch 2020-11-11 15:13:00 UTC (rev 400393)
+++ libxml2-2.9.10-CVE-2020-24977.patch 2020-11-11 15:13:05 UTC (rev 400394)
@@ -1,41 +0,0 @@
-From 8e7c20a1af8776677d7890f30b7a180567701a49 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer at aevum.de>
-Date: Mon, 3 Aug 2020 17:30:41 +0200
-Subject: [PATCH] Fix integer overflow when comparing schema dates
-
-Found by OSS-Fuzz.
----
- xmlschemastypes.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/xmlschemastypes.c b/xmlschemastypes.c
-index 4249d700..d6b9f924 100644
---- a/xmlschemastypes.c
-+++ b/xmlschemastypes.c
-@@ -3691,6 +3691,8 @@ xmlSchemaCompareDurations(xmlSchemaValPtr x, xmlSchemaValPtr y)
- minday = 0;
- maxday = 0;
- } else {
-+ if (myear > LONG_MAX / 366)
-+ return -2;
- /* FIXME: This doesn't take leap year exceptions every 100/400 years
- into account. */
- maxday = 365 * myear + (myear + 3) / 4;
-@@ -4079,6 +4081,14 @@ xmlSchemaCompareDates (xmlSchemaValPtr x, xmlSchemaValPtr y)
- if ((x == NULL) || (y == NULL))
- return -2;
-
-+ if ((x->value.date.year > LONG_MAX / 366) ||
-+ (x->value.date.year < LONG_MIN / 366) ||
-+ (y->value.date.year > LONG_MAX / 366) ||
-+ (y->value.date.year < LONG_MIN / 366)) {
-+ /* Possible overflow when converting to days. */
-+ return -2;
-+ }
-+
- if (x->value.date.tz_flag) {
-
- if (!y->value.date.tz_flag) {
---
-2.28.0.rc2
-
Copied: libxml2/repos/staging-x86_64/libxml2-2.9.10-CVE-2020-24977.patch (from rev 400393, libxml2/trunk/libxml2-2.9.10-CVE-2020-24977.patch)
===================================================================
--- libxml2-2.9.10-CVE-2020-24977.patch (rev 0)
+++ libxml2-2.9.10-CVE-2020-24977.patch 2020-11-11 15:13:05 UTC (rev 400394)
@@ -0,0 +1,36 @@
+From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer at 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 a/xmllint.c b/xmllint.c
+index f6a8e463..c647486f 100644
+--- a/xmllint.c
++++ b/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);
+--
+2.28.0.rc2
+
Deleted: libxml2-2.9.10-CVE-2020-7595.patch
===================================================================
--- libxml2-2.9.10-CVE-2020-7595.patch 2020-11-11 15:13:00 UTC (rev 400393)
+++ libxml2-2.9.10-CVE-2020-7595.patch 2020-11-11 15:13:05 UTC (rev 400394)
@@ -1,32 +0,0 @@
-From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001
-From: Zhipeng Xie <xiezhipeng1 at 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 <xiezhipeng1 at huawei.com>
----
- 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
-
Copied: libxml2/repos/staging-x86_64/libxml2-2.9.10-CVE-2020-7595.patch (from rev 400393, libxml2/trunk/libxml2-2.9.10-CVE-2020-7595.patch)
===================================================================
--- libxml2-2.9.10-CVE-2020-7595.patch (rev 0)
+++ libxml2-2.9.10-CVE-2020-7595.patch 2020-11-11 15:13:05 UTC (rev 400394)
@@ -0,0 +1,32 @@
+From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001
+From: Zhipeng Xie <xiezhipeng1 at 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 <xiezhipeng1 at huawei.com>
+---
+ 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
+
Copied: libxml2/repos/staging-x86_64/libxml2-2.9.10-fix-integer-overflow.patch (from rev 400393, libxml2/trunk/libxml2-2.9.10-fix-integer-overflow.patch)
===================================================================
--- libxml2-2.9.10-fix-integer-overflow.patch (rev 0)
+++ libxml2-2.9.10-fix-integer-overflow.patch 2020-11-11 15:13:05 UTC (rev 400394)
@@ -0,0 +1,41 @@
+From 8e7c20a1af8776677d7890f30b7a180567701a49 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer at aevum.de>
+Date: Mon, 3 Aug 2020 17:30:41 +0200
+Subject: [PATCH] Fix integer overflow when comparing schema dates
+
+Found by OSS-Fuzz.
+---
+ xmlschemastypes.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/xmlschemastypes.c b/xmlschemastypes.c
+index 4249d700..d6b9f924 100644
+--- a/xmlschemastypes.c
++++ b/xmlschemastypes.c
+@@ -3691,6 +3691,8 @@ xmlSchemaCompareDurations(xmlSchemaValPtr x, xmlSchemaValPtr y)
+ minday = 0;
+ maxday = 0;
+ } else {
++ if (myear > LONG_MAX / 366)
++ return -2;
+ /* FIXME: This doesn't take leap year exceptions every 100/400 years
+ into account. */
+ maxday = 365 * myear + (myear + 3) / 4;
+@@ -4079,6 +4081,14 @@ xmlSchemaCompareDates (xmlSchemaValPtr x, xmlSchemaValPtr y)
+ if ((x == NULL) || (y == NULL))
+ return -2;
+
++ if ((x->value.date.year > LONG_MAX / 366) ||
++ (x->value.date.year < LONG_MIN / 366) ||
++ (y->value.date.year > LONG_MAX / 366) ||
++ (y->value.date.year < LONG_MIN / 366)) {
++ /* Possible overflow when converting to days. */
++ return -2;
++ }
++
+ if (x->value.date.tz_flag) {
+
+ if (!y->value.date.tz_flag) {
+--
+2.28.0.rc2
+
Deleted: libxml2-2.9.10-parenthesize-type-checks.patch
===================================================================
--- libxml2-2.9.10-parenthesize-type-checks.patch 2020-11-11 15:13:00 UTC (rev 400393)
+++ libxml2-2.9.10-parenthesize-type-checks.patch 2020-11-11 15:13:05 UTC (rev 400394)
@@ -1,92 +0,0 @@
-From edc7b6abb0c125eeb888748c334897f60aab0854 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
-Date: Fri, 28 Feb 2020 12:48:14 +0100
-Subject: [PATCH] Parenthesize Py<type>_Check() in ifs
-
-In C, if expressions should be parenthesized.
-PyLong_Check, PyUnicode_Check etc. happened to expand to a parenthesized
-expression before, but that's not API to rely on.
-
-Since Python 3.9.0a4 it needs to be parenthesized explicitly.
-
-Fixes https://gitlab.gnome.org/GNOME/libxml2/issues/149
----
- python/libxml.c | 4 ++--
- python/types.c | 12 ++++++------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/python/libxml.c b/python/libxml.c
-index bc676c4e..81e709f3 100644
---- a/python/libxml.c
-+++ b/python/libxml.c
-@@ -294,7 +294,7 @@ xmlPythonFileReadRaw (void * context, char * buffer, int len) {
- lenread = PyBytes_Size(ret);
- data = PyBytes_AsString(ret);
- #ifdef PyUnicode_Check
-- } else if PyUnicode_Check (ret) {
-+ } else if (PyUnicode_Check (ret)) {
- #if PY_VERSION_HEX >= 0x03030000
- Py_ssize_t size;
- const char *tmp;
-@@ -359,7 +359,7 @@ xmlPythonFileRead (void * context, char * buffer, int len) {
- lenread = PyBytes_Size(ret);
- data = PyBytes_AsString(ret);
- #ifdef PyUnicode_Check
-- } else if PyUnicode_Check (ret) {
-+ } else if (PyUnicode_Check (ret)) {
- #if PY_VERSION_HEX >= 0x03030000
- Py_ssize_t size;
- const char *tmp;
-diff --git a/python/types.c b/python/types.c
-index c2bafeb1..ed284ec7 100644
---- a/python/types.c
-+++ b/python/types.c
-@@ -602,16 +602,16 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
- if (obj == NULL) {
- return (NULL);
- }
-- if PyFloat_Check (obj) {
-+ if (PyFloat_Check (obj)) {
- ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));
-- } else if PyLong_Check(obj) {
-+ } else if (PyLong_Check(obj)) {
- #ifdef PyLong_AS_LONG
- ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj));
- #else
- ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));
- #endif
- #ifdef PyBool_Check
-- } else if PyBool_Check (obj) {
-+ } else if (PyBool_Check (obj)) {
-
- if (obj == Py_True) {
- ret = xmlXPathNewBoolean(1);
-@@ -620,14 +620,14 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
- ret = xmlXPathNewBoolean(0);
- }
- #endif
-- } else if PyBytes_Check (obj) {
-+ } else if (PyBytes_Check (obj)) {
- xmlChar *str;
-
- str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj),
- PyBytes_GET_SIZE(obj));
- ret = xmlXPathWrapString(str);
- #ifdef PyUnicode_Check
-- } else if PyUnicode_Check (obj) {
-+ } else if (PyUnicode_Check (obj)) {
- #if PY_VERSION_HEX >= 0x03030000
- xmlChar *str;
- const char *tmp;
-@@ -650,7 +650,7 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
- ret = xmlXPathWrapString(str);
- #endif
- #endif
-- } else if PyList_Check (obj) {
-+ } else if (PyList_Check (obj)) {
- int i;
- PyObject *node;
- xmlNodePtr cur;
---
-2.24.1
-
Copied: libxml2/repos/staging-x86_64/libxml2-2.9.10-parenthesize-type-checks.patch (from rev 400393, libxml2/trunk/libxml2-2.9.10-parenthesize-type-checks.patch)
===================================================================
--- libxml2-2.9.10-parenthesize-type-checks.patch (rev 0)
+++ libxml2-2.9.10-parenthesize-type-checks.patch 2020-11-11 15:13:05 UTC (rev 400394)
@@ -0,0 +1,92 @@
+From edc7b6abb0c125eeb888748c334897f60aab0854 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
+Date: Fri, 28 Feb 2020 12:48:14 +0100
+Subject: [PATCH] Parenthesize Py<type>_Check() in ifs
+
+In C, if expressions should be parenthesized.
+PyLong_Check, PyUnicode_Check etc. happened to expand to a parenthesized
+expression before, but that's not API to rely on.
+
+Since Python 3.9.0a4 it needs to be parenthesized explicitly.
+
+Fixes https://gitlab.gnome.org/GNOME/libxml2/issues/149
+---
+ python/libxml.c | 4 ++--
+ python/types.c | 12 ++++++------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/python/libxml.c b/python/libxml.c
+index bc676c4e..81e709f3 100644
+--- a/python/libxml.c
++++ b/python/libxml.c
+@@ -294,7 +294,7 @@ xmlPythonFileReadRaw (void * context, char * buffer, int len) {
+ lenread = PyBytes_Size(ret);
+ data = PyBytes_AsString(ret);
+ #ifdef PyUnicode_Check
+- } else if PyUnicode_Check (ret) {
++ } else if (PyUnicode_Check (ret)) {
+ #if PY_VERSION_HEX >= 0x03030000
+ Py_ssize_t size;
+ const char *tmp;
+@@ -359,7 +359,7 @@ xmlPythonFileRead (void * context, char * buffer, int len) {
+ lenread = PyBytes_Size(ret);
+ data = PyBytes_AsString(ret);
+ #ifdef PyUnicode_Check
+- } else if PyUnicode_Check (ret) {
++ } else if (PyUnicode_Check (ret)) {
+ #if PY_VERSION_HEX >= 0x03030000
+ Py_ssize_t size;
+ const char *tmp;
+diff --git a/python/types.c b/python/types.c
+index c2bafeb1..ed284ec7 100644
+--- a/python/types.c
++++ b/python/types.c
+@@ -602,16 +602,16 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
+ if (obj == NULL) {
+ return (NULL);
+ }
+- if PyFloat_Check (obj) {
++ if (PyFloat_Check (obj)) {
+ ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));
+- } else if PyLong_Check(obj) {
++ } else if (PyLong_Check(obj)) {
+ #ifdef PyLong_AS_LONG
+ ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj));
+ #else
+ ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));
+ #endif
+ #ifdef PyBool_Check
+- } else if PyBool_Check (obj) {
++ } else if (PyBool_Check (obj)) {
+
+ if (obj == Py_True) {
+ ret = xmlXPathNewBoolean(1);
+@@ -620,14 +620,14 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
+ ret = xmlXPathNewBoolean(0);
+ }
+ #endif
+- } else if PyBytes_Check (obj) {
++ } else if (PyBytes_Check (obj)) {
+ xmlChar *str;
+
+ str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj),
+ PyBytes_GET_SIZE(obj));
+ ret = xmlXPathWrapString(str);
+ #ifdef PyUnicode_Check
+- } else if PyUnicode_Check (obj) {
++ } else if (PyUnicode_Check (obj)) {
+ #if PY_VERSION_HEX >= 0x03030000
+ xmlChar *str;
+ const char *tmp;
+@@ -650,7 +650,7 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
+ ret = xmlXPathWrapString(str);
+ #endif
+ #endif
+- } else if PyList_Check (obj) {
++ } else if (PyList_Check (obj)) {
+ int i;
+ PyObject *node;
+ xmlNodePtr cur;
+--
+2.24.1
+
Deleted: libxml2-2.9.8-python3-unicode-errors.patch
===================================================================
--- libxml2-2.9.8-python3-unicode-errors.patch 2020-11-11 15:13:00 UTC (rev 400393)
+++ libxml2-2.9.8-python3-unicode-errors.patch 2020-11-11 15:13:05 UTC (rev 400394)
@@ -1,34 +0,0 @@
-Index: libxml2-2.9.5/python/libxml.c
-===================================================================
---- libxml2-2.9.5.orig/python/libxml.c
-+++ libxml2-2.9.5/python/libxml.c
-@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
- PyObject *message;
- PyObject *result;
- char str[1000];
-+ unsigned char *ptr = (unsigned char *)str;
-
- #ifdef DEBUG_ERROR
- printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
-@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
- str[999] = 0;
- va_end(ap);
-
-+#if PY_MAJOR_VERSION >= 3
-+ /* Ensure the error string doesn't start at UTF8 continuation. */
-+ while (*ptr && (*ptr & 0xc0) == 0x80)
-+ ptr++;
-+#endif
-+
- list = PyTuple_New(2);
- PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
- Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
-- message = libxml_charPtrConstWrap(str);
-+ message = libxml_charPtrConstWrap(ptr);
- PyTuple_SetItem(list, 1, message);
- result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
-+ /* Forget any errors caused in the error handler. */
-+ PyErr_Clear();
- Py_XDECREF(list);
- Py_XDECREF(result);
- }
Copied: libxml2/repos/staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch (from rev 400393, libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch)
===================================================================
--- libxml2-2.9.8-python3-unicode-errors.patch (rev 0)
+++ libxml2-2.9.8-python3-unicode-errors.patch 2020-11-11 15:13:05 UTC (rev 400394)
@@ -0,0 +1,34 @@
+Index: libxml2-2.9.5/python/libxml.c
+===================================================================
+--- libxml2-2.9.5.orig/python/libxml.c
++++ libxml2-2.9.5/python/libxml.c
+@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ PyObject *message;
+ PyObject *result;
+ char str[1000];
++ unsigned char *ptr = (unsigned char *)str;
+
+ #ifdef DEBUG_ERROR
+ printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
+@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ str[999] = 0;
+ va_end(ap);
+
++#if PY_MAJOR_VERSION >= 3
++ /* Ensure the error string doesn't start at UTF8 continuation. */
++ while (*ptr && (*ptr & 0xc0) == 0x80)
++ ptr++;
++#endif
++
+ list = PyTuple_New(2);
+ PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
+ Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
+- message = libxml_charPtrConstWrap(str);
++ message = libxml_charPtrConstWrap(ptr);
+ PyTuple_SetItem(list, 1, message);
+ result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
++ /* Forget any errors caused in the error handler. */
++ PyErr_Clear();
+ Py_XDECREF(list);
+ Py_XDECREF(result);
+ }
More information about the arch-commits
mailing list