diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-04-27 06:44:04 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-04-27 06:45:58 +0000 |
| commit | 2eb2dada1a855d3d43d8867f0605b9ed42cbb6af (patch) | |
| tree | d9241c12b621a8f12b88a43da1c738b1251e5b61 /main/libxml2 | |
| parent | e9c0f62f68ae7415f7dad299f277762f704f3fed (diff) | |
| download | aports-2eb2dada1a855d3d43d8867f0605b9ed42cbb6af.tar.bz2 aports-2eb2dada1a855d3d43d8867f0605b9ed42cbb6af.tar.xz | |
main/libxml2: store patch in aports tree
upstream patch may get new checksum when they update git version, since
git version is a part of the footer in the patch. Store the patch in the
aports tree to avoid checksum errors.
Diffstat (limited to 'main/libxml2')
| -rw-r--r-- | main/libxml2/APKBUILD | 2 | ||||
| -rw-r--r-- | main/libxml2/libxml2-CVE-2020-7595.patch | 32 |
2 files changed, 33 insertions, 1 deletions
diff --git a/main/libxml2/APKBUILD b/main/libxml2/APKBUILD index d1eab89f8f..ab2d18b9c1 100644 --- a/main/libxml2/APKBUILD +++ b/main/libxml2/APKBUILD @@ -14,7 +14,7 @@ subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-utils py3-$pkgname:_py3" options="!strip" source="http://xmlsoft.org/sources/libxml2-$pkgver.tar.gz - libxml2-CVE-2020-7595.patch::https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch + libxml2-CVE-2020-7595.patch revert-Make-xmlFreeNodeList-non-recursive.patch libxml2-2.9.8-python3-unicode-errors.patch " diff --git a/main/libxml2/libxml2-CVE-2020-7595.patch b/main/libxml2/libxml2-CVE-2020-7595.patch new file mode 100644 index 0000000000..3dd6774976 --- /dev/null +++ b/main/libxml2/libxml2-CVE-2020-7595.patch @@ -0,0 +1,32 @@ +From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie <xiezhipeng1@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@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 + |