From 6ed39a82c6585057362e8051b13a958a9a1f5c90 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Sat, 15 Jun 2024 19:37:27 +0200
Subject: [PATCH] runtest: Allow catalogs

It's enough to disable the system catalog to avoid unwanted allocations.
---
 runtest.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/runtest.c b/runtest.c
index f3945dc3..26fbcfaf 100644
--- a/runtest.c
+++ b/runtest.c
@@ -266,13 +266,16 @@ initializeLibxml2(void) {
     xmlInitParser();
     xmlMemSetup(xmlMemFree, xmlMemMalloc, xmlMemRealloc, xmlMemoryStrdup);
 #ifdef LIBXML_CATALOG_ENABLED
+    /*
+     * Disable system catalog which could cause lazy memory allocations
+     * resulting in false positive memory leaks.
+     */
 #ifdef _WIN32
     putenv("XML_CATALOG_FILES=");
 #else
     setenv("XML_CATALOG_FILES", "", 1);
 #endif
     xmlInitializeCatalog();
-    xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
     xmlSchemaInitTypes();
@@ -4326,13 +4329,7 @@ threadsTest(const char *filename ATTRIBUTE_UNUSED,
 	    const char *resul ATTRIBUTE_UNUSED,
 	    const char *err ATTRIBUTE_UNUSED,
 	    int options ATTRIBUTE_UNUSED) {
-    int ret;
-
-    xmlCatalogSetDefaults(XML_CATA_ALLOW_ALL);
-    ret = testThread();
-    xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
-
-    return(ret);
+    return(testThread());
 }
 #endif