Introduce Z_PARAM_GET_PREV_ZVAL()

Author: tstarling

Zend/zend_API.h

@@ -1482,6 +1482,10 @@ ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char *
 		SEPARATE_ZVAL_NOREF(_arg); \
 	}
 
+/* get the zval* for a previously parsed argument */
+#define Z_PARAM_GET_PREV_ZVAL(dest) \
+	zend_parse_arg_zval_deref(_arg, &dest, 0);
+
 /* old "|" */
 #define Z_PARAM_OPTIONAL \
 	_optional = 1;

ext/libxml/libxml.c

@@ -1064,24 +1064,17 @@ PHP_FUNCTION(libxml_set_external_entity_loader)
 	zval					*callback;
 	zend_fcall_info			fci;
 	zend_fcall_info_cache	fcc;
-	char					*error = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_ZVAL(callback)
+		Z_PARAM_FUNC_OR_NULL(fci, fcc)
+		Z_PARAM_GET_PREV_ZVAL(callback)
 	ZEND_PARSE_PARAMETERS_END();
 
-	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(1, "must be a valid callback or null, %s", error);
-			RETURN_THROWS();
-		}
+	if (ZEND_FCI_INITIALIZED(fci)) { /* argument not null */
 		LIBXML(entity_loader).fci = fci;
 		LIBXML(entity_loader).fcc = fcc;
+	} else {
+		LIBXML(entity_loader).fci.size = 0;
 	}
 	if (!Z_ISNULL(LIBXML(entity_loader).callback)) {
 		zval_ptr_dtor_nogc(&LIBXML(entity_loader).callback);

ext/libxml/tests/libxml_set_external_entity_loader_error2.phpt

@@ -1,7 +1,7 @@
 --TEST--
 libxml_set_external_entity_loader() with non-callable argument
 --EXTENSIONS--
-dom
+libxml
 --FILE--
 <?php
 try {