Make libxml_set_external_entity_loader() return the previous loader

Fixes #76763.

Author: tstarling

ext/libxml/libxml.c

@@ -226,23 +226,11 @@ static PHP_GINIT_FUNCTION(libxml)
 	ZVAL_UNDEF(&libxml_globals->stream_context);
 	libxml_globals->error_buffer.s = NULL;
 	libxml_globals->error_list = NULL;
-	ZVAL_UNDEF(&libxml_globals->entity_loader.object);
+	ZVAL_NULL(&libxml_globals->entity_loader.callback);
 	libxml_globals->entity_loader.fci.size = 0;
 	libxml_globals->entity_loader_disabled = 0;
 }
 
-static void _php_libxml_destroy_fci(zend_fcall_info *fci, zval *object)
-{
-	if (fci->size > 0) {
-		zval_ptr_dtor(&fci->function_name);
-		fci->size = 0;
-	}
-	if (!Z_ISUNDEF_P(object)) {
-		zval_ptr_dtor(object);
-		ZVAL_UNDEF(object);
-	}
-}
-
 /* Channel libxml file io layer through the PHP streams subsystem.
  * This allows use of ftps:// and https:// urls */
 
@@ -892,8 +880,12 @@ static PHP_RINIT_FUNCTION(libxml)
 
 static PHP_RSHUTDOWN_FUNCTION(libxml)
 {
-	_php_libxml_destroy_fci(&LIBXML(entity_loader).fci, &LIBXML(entity_loader).object);
-
+	LIBXML(entity_loader).fci.size = 0;
+	if (!Z_ISNULL(LIBXML(entity_loader).callback)) {
+		zval_ptr_dtor_nogc(&LIBXML(entity_loader).callback);
+		ZVAL_NULL(&LIBXML(entity_loader).callback);
+	}
+	
 	return SUCCESS;
 }
 
@@ -1109,29 +1101,36 @@ PHP_FUNCTION(libxml_disable_entity_loader)
 }
 /* }}} */
 
-/* {{{ Changes the default external entity loader */
+/* {{{ Change the default external entity loader and return the previous loader */
 PHP_FUNCTION(libxml_set_external_entity_loader)
 {
+	zval 					*callback;
 	zend_fcall_info			fci;
-	zend_fcall_info_cache	fcc;
+	zend_fcall_info_cache 	fcc;
+	char *error = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_FUNC_OR_NULL(fci, fcc)
+		Z_PARAM_ZVAL(callback)
 	ZEND_PARSE_PARAMETERS_END();
 
-	_php_libxml_destroy_fci(&LIBXML(entity_loader).fci, &LIBXML(entity_loader).object);
-
-	if (ZEND_FCI_INITIALIZED(fci)) { /* argument not null */
-		LIBXML(entity_loader).fci = fci;
-		Z_ADDREF(fci.function_name);
-		if (fci.object != NULL) {
-			ZVAL_OBJ(&LIBXML(entity_loader).object, fci.object);
-			Z_ADDREF(LIBXML(entity_loader).object);
+	if (Z_ISNULL_P(callback)) {
+		LIBXML(entity_loader).fci.size = 0;
+	} else {
+		fci.size = sizeof(fci);
+		fci.object = NULL;
+		fci.named_params = NULL;
+		if (zend_fcall_info_init(callback, 0, &fci, &fcc, NULL, &error) != SUCCESS) {
+			zend_argument_type_error(0, "must be a valid callback or NULL, %s", error);
+			RETURN_FALSE;
 		}
+		LIBXML(entity_loader).fci = fci;
 		LIBXML(entity_loader).fcc = fcc;
 	}
-
-	RETURN_TRUE;
+	ZVAL_COPY(return_value, &LIBXML(entity_loader).callback);
+	if (!Z_ISNULL(LIBXML(entity_loader).callback)) {
+		zval_ptr_dtor_nogc(&LIBXML(entity_loader).callback);
+	}
+	ZVAL_COPY(&LIBXML(entity_loader).callback, callback);
 }
 /* }}} */
 

ext/libxml/libxml.stub.php

@@ -27,4 +27,4 @@ function libxml_clear_errors(): void {}
 /** @deprecated */
 function libxml_disable_entity_loader(bool $disable = true): bool {}
 
-function libxml_set_external_entity_loader(?callable $resolver_function): bool {}
+function libxml_set_external_entity_loader(?callable $resolver_function): callable|bool|null {}

ext/libxml/libxml_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 4bde2f5c4e55b6e0c273b0d8605cb765cc9f8400 */
+ * Stub hash: 71b8744c16e10fc3af07a66ca68cb68b5410bc85 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_libxml_set_streams_context, 0, 1, IS_VOID, 0)
 	ZEND_ARG_INFO(0, context)
@@ -22,7 +22,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_libxml_disable_entity_loader, 0,
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, disable, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_libxml_set_external_entity_loader, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_libxml_set_external_entity_loader, 0, 1, MAY_BE_CALLABLE|MAY_BE_BOOL|MAY_BE_NULL)
 	ZEND_ARG_TYPE_INFO(0, resolver_function, IS_CALLABLE, 1)
 ZEND_END_ARG_INFO()
 

ext/libxml/php_libxml.h

@@ -43,8 +43,8 @@ ZEND_BEGIN_MODULE_GLOBALS(libxml)
 	smart_str error_buffer;
 	zend_llist *error_list;
 	struct _php_libxml_entity_resolver {
-		zval                    object;
-		zend_fcall_info			fci;
+		zval 					callback;
+		zend_fcall_info 		fci;
 		zend_fcall_info_cache	fcc;
 	} entity_loader;
 	bool entity_loader_disabled;

ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt

@@ -22,6 +22,6 @@ try {
 echo "Done.\n";
 ?>
 --EXPECT--
-bool(true)
+NULL
 Exception: Too few arguments to function {closure}(), 3 passed and exactly 4 expected
 Done.

ext/libxml/tests/libxml_set_external_entity_loader_return.phpt

@@ -0,0 +1,33 @@
+--TEST--
+libxml_set_external_entity_loader() returns previous handler
+--SKIPIF--
+<?php if (!extension_loaded('dom')) die('skip dom extension not available'); ?>
+--FILE--
+<?php
+
+class Handler {
+	private $name;
+
+	public function __construct($name) {
+		$this->name = $name;
+	}
+
+	public function handle($public, $system, $context) {
+		return null;
+	}
+
+	public function __toString() {
+		return "Handler#{$this->name}";
+	}
+}
+
+var_dump(libxml_set_external_entity_loader([new Handler('A'), 'handle']));
+print libxml_set_external_entity_loader([new Handler('B'), 'handle'])[0] . "\n";
+print libxml_set_external_entity_loader(null)[0] . "\n";
+var_dump(libxml_set_external_entity_loader(null));
+
+--EXPECT--
+NULL
+Handler#A
+Handler#B
+NULL