From a770e81c85f6b378d158bf20f16aa57bceb35265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Chavero?= <ichavero@chavero.com.mx>
Date: Mon, 22 Sep 2025 17:47:55 -0600
Subject: [PATCH] Update tests for new libxml2 IO

---
 tests/fuzz/fuzz.c        | 4 ++--
 tests/fuzz/fuzz.h        | 2 +-
 tests/fuzz/testTargets.c | 4 ++--
 tests/runtest.c          | 3 ++-
 xsltproc/testThreads.c   | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/tests/fuzz/fuzz.c b/tests/fuzz/fuzz.c
index fc474047..5e6afe78 100644
--- a/tests/fuzz/fuzz.c
+++ b/tests/fuzz/fuzz.c
@@ -258,7 +258,7 @@ xsltFuzzXsltInit(void) {
     return(0);
 }
 
-const xmlChar *
+xmlChar *
 xsltFuzzXslt(const char *data, size_t size) {
     const char *xsltBuffer, *xsltUrl, *docBuffer, *docUrl;
     xmlDocPtr xsltDoc = NULL, doc = NULL;
@@ -266,7 +266,7 @@ xsltFuzzXslt(const char *data, size_t size) {
     xmlNodePtr root;
     xsltStylesheetPtr sheet = NULL;
     xsltTransformContextPtr ctxt = NULL;
-    const xmlChar *ret = NULL;
+    xmlChar *ret = NULL;
     size_t xsltSize, docSize, maxAllocs;
     int retLen;
 
diff --git a/tests/fuzz/fuzz.h b/tests/fuzz/fuzz.h
index 59d59ef5..8c8cc2c3 100644
--- a/tests/fuzz/fuzz.h
+++ b/tests/fuzz/fuzz.h
@@ -38,7 +38,7 @@ xsltFuzzXPathCleanup(void);
 int
 xsltFuzzXsltInit(void);
 
-const xmlChar *
+xmlChar *
 xsltFuzzXslt(const char *data, size_t size);
 
 void
diff --git a/tests/fuzz/testTargets.c b/tests/fuzz/testTargets.c
index 5f492cf7..86026e78 100644
--- a/tests/fuzz/testTargets.c
+++ b/tests/fuzz/testTargets.c
@@ -40,7 +40,7 @@ testXPath(void) {
 
 static int
 testXslt(void) {
-    const xmlChar *result;
+    xmlChar *result;
     const char fuzzData[] =
         "\0\0\0\0stylesheet.xsl\\\n"
         "<xsl:stylesheet"
@@ -73,7 +73,7 @@ testXslt(void) {
         ret = 1;
     }
 
-    xmlFree((void *) result);
+    xmlFree(result);
     xsltFuzzXsltCleanup();
 
     return ret;
diff --git a/tests/runtest.c b/tests/runtest.c
index ee7417b8..2ec701ea 100644
--- a/tests/runtest.c
+++ b/tests/runtest.c
@@ -442,7 +442,8 @@ testStructuredErrorHandler(void *ctx ATTRIBUTE_UNUSED, const xmlError *err) {
 static void
 initializeLibxml2(void) {
     xmlInitParser();
-    xmlSetExternalEntityLoader(xmlNoNetExternalEntityLoader);
+    xmlSetExternalEntityLoader(xmlGetExternalEntityLoader());
+    //xmlSetExternalEntityLoader(xmlNoNetExternalEntityLoader);
     xmlSetGenericErrorFunc(NULL, testErrorHandler);
     xsltSetGenericErrorFunc(NULL, testErrorHandler);
     xmlSetStructuredErrorFunc(NULL,
diff --git a/xsltproc/testThreads.c b/xsltproc/testThreads.c
index 7bdfc111..ba8d903d 100644
--- a/xsltproc/testThreads.c
+++ b/xsltproc/testThreads.c
@@ -97,7 +97,7 @@ threadRoutine1(void *data)
     xmlDocPtr input;
     xmlDocPtr style;
     xmlDocPtr res;
-    const xmlChar *result;
+    xmlChar *result;
     int len;
     xsltStylesheetPtr cur;
     int id = (int) (size_t) data;
@@ -142,7 +142,7 @@ threadRoutine2(void *data)
 {
     xmlDocPtr input;
     xmlDocPtr res;
-    const xmlChar *result;
+    xmlChar *result;
     int len;
     xsltStylesheetPtr cur = (xsltStylesheetPtr) data;