diff options
| author | Max Rees <maxcrees@me.com> | 2020-03-03 14:33:49 +0000 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2020-03-09 21:27:48 -0500 |
| commit | 1ca9f51b0901a84b56258b19a78acf4c01f93eb5 (patch) | |
| tree | 41c58a426fab16eb544dbd1a017d152c502a800b /system/libxml2/CVE-2020-7595.patch | |
| parent | 680d3d2f67370934c1aff033819eef438bcb6f94 (diff) | |
| download | packages-1ca9f51b0901a84b56258b19a78acf4c01f93eb5.tar.gz packages-1ca9f51b0901a84b56258b19a78acf4c01f93eb5.tar.bz2 packages-1ca9f51b0901a84b56258b19a78acf4c01f93eb5.tar.xz packages-1ca9f51b0901a84b56258b19a78acf4c01f93eb5.zip | |
system/libxml2: patch CVE-2019-20388 and CVE-2020-7595 (#234)
Diffstat (limited to 'system/libxml2/CVE-2020-7595.patch')
| -rw-r--r-- | system/libxml2/CVE-2020-7595.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/system/libxml2/CVE-2020-7595.patch b/system/libxml2/CVE-2020-7595.patch new file mode 100644 index 000000000..3dd677497 --- /dev/null +++ b/system/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 + |