From 2cb02bdd35ce1fcd7ea2cca5ed6b0f6e3be28362 Mon Sep 17 00:00:00 2001
From: fuanan <2385803914@qq.com>
Date: Fri, 24 Jun 2022 10:07:40 +0800
Subject: [PATCH] Fix memory leaks in xmlACatalogAdd when xmlHashAddEntry
 failed

---
 ...talogAdd-when-xmlHashAddEntry-failed.patch | 25 +++++++++++++++++++
 libxml2.spec                                  |  9 ++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 Fix-memory-leaks-in-xmlACatalogAdd-when-xmlHashAddEntry-failed.patch

diff --git a/Fix-memory-leaks-in-xmlACatalogAdd-when-xmlHashAddEntry-failed.patch b/Fix-memory-leaks-in-xmlACatalogAdd-when-xmlHashAddEntry-failed.patch
new file mode 100644
index 0000000..08dc01e
--- /dev/null
+++ b/Fix-memory-leaks-in-xmlACatalogAdd-when-xmlHashAddEntry-failed.patch
@@ -0,0 +1,25 @@
+From 43555b3ff9c28a44aa27f447475b9f9cfccbe702 Mon Sep 17 00:00:00 2001
+From: xiezhipeng <xiezhipeng1@huawei.com>
+Date: Fri, 24 Jun 2022 09:39:54 +0800
+Subject: [PATCH] fix memory leaks in xmlACatalogAdd
+
+---
+ catalog.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/catalog.c b/catalog.c
+index effbb2e..866e753 100644
+--- a/catalog.c
++++ b/catalog.c
+@@ -2981,6 +2981,8 @@ xmlACatalogAdd(xmlCatalogPtr catal, const xmlChar * type,
+ 	    if (catal->sgml == NULL)
+ 		catal->sgml = xmlHashCreate(10);
+             res = xmlHashAddEntry(catal->sgml, orig, entry);
++            if (res)
++                xmlFreeCatalogEntry(entry, NULL);
+         }
+     }
+     return (res);
+-- 
+1.8.3.1
+
diff --git a/libxml2.spec b/libxml2.spec
index 928ce06..3e3decd 100644
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
 Version: 2.9.10
-Release: 29
+Release: 30
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@@ -121,6 +121,7 @@ Patch108:backport-xmlParseBalancedChunkMemory-must-not-be-called-with-.patch
 Patch109:backport-CVE-2022-23308-Use-after-free-of-ID-and-IDREF-attrib.patch
 Patch110:backport-CVE-2022-29824-Fix-integer-overflows-in-xmlBuf-and-xmlBuffer.patch
 Patch111:Fix-memory-leaks-for-xmlACatalogAdd.patch
+Patch112:Fix-memory-leaks-in-xmlACatalogAdd-when-xmlHashAddEntry-failed.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: python2-devel
@@ -313,6 +314,12 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Jun 24 2022 fuanan <fuanan3@h-partners.com> - 2.9.10-30
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Fix memory leaks in xmlACatalogAdd when xmlHashAddEntry failed
+
 * Thu Jun 16 2022 fuanan <fuanan3@h-partners.com> - 2.9.10-29
 - Type:bugfix
 - ID:NA