From ec577a5de2165e461994ef5a51c231247a94a089 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Mon, 10 Feb 2020 16:11:17 +0000
Subject: [PATCH] Fix CVE-2020-7595 (#1799786)

---
 libxml2-2.9.10-CVE-2020-7595.patch | 32 ++++++++++++++++++++++++++++++
 libxml2.spec                       |  3 +++
 2 files changed, 35 insertions(+)
 create mode 100644 libxml2-2.9.10-CVE-2020-7595.patch

diff --git a/libxml2-2.9.10-CVE-2020-7595.patch b/libxml2-2.9.10-CVE-2020-7595.patch
new file mode 100644
index 0000000..3dd6774
--- /dev/null
+++ b/libxml2-2.9.10-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
+
diff --git a/libxml2.spec b/libxml2.spec
index 3b950a4..8a513de 100644
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -13,6 +13,8 @@ Patch1:         libxml2-2.9.8-python3-unicode-errors.patch
 Patch2:         https://gitlab.gnome.org/GNOME/libxml2/commit/0815302dee2b78139832c2080348086a0564836b.patch#/fix-relaxed-approach-to-nested-documents.patch
 # https://gitlab.gnome.org/GNOME/libxml2/merge_requests/68
 Patch3:         libxml2-2.9.10-CVE-2019-20388.patch
+# https://gitlab.gnome.org/GNOME/libxml2/merge_requests/63
+Patch4:         libxml2-2.9.10-CVE-2020-7595.patch
 
 BuildRequires:  gcc
 BuildRequires:  make
@@ -143,6 +145,7 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz
 %changelog
 * Mon Feb 10 2020 David King <amigadave@amigadave.com> - 2.9.10-4
 - Fix CVE-2019-20388 (#1799736)
+- Fix CVE-2020-7595 (#1799786)
 
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild