Skip to content

Commit 52de095

Browse files
committedOct 10, 2023
ext/libxml: Use new F ZPP modifier
1 parent d863149 commit 52de095

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed
 

‎ext/libxml/libxml.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -1181,20 +1181,14 @@ PHP_FUNCTION(libxml_set_external_entity_loader)
11811181
zend_fcall_info_cache fcc;
11821182

11831183
ZEND_PARSE_PARAMETERS_START(1, 1)
1184-
Z_PARAM_FUNC_OR_NULL(fci, fcc)
1184+
Z_PARAM_FUNC_NO_TRAMPOLINE_FREE_OR_NULL(fci, fcc)
11851185
ZEND_PARSE_PARAMETERS_END();
11861186

11871187
/* Unset old callback if it's defined */
11881188
if (ZEND_FCC_INITIALIZED(LIBXML(entity_loader_callback))) {
11891189
zend_fcc_dtor(&LIBXML(entity_loader_callback));
11901190
}
11911191
if (ZEND_FCI_INITIALIZED(fci)) { /* argument not null */
1192-
if (!ZEND_FCC_INITIALIZED(fcc)) {
1193-
zend_is_callable_ex(&fci.function_name, NULL, IS_CALLABLE_SUPPRESS_DEPRECATIONS, NULL, &fcc, NULL);
1194-
/* Call trampoline has been cleared by zpp. Refetch it, because we want to deal
1195-
* with it outselves. It is important that it is not refetched on every call,
1196-
* because calls may occur from different scopes. */
1197-
}
11981192
zend_fcc_dup(&LIBXML(entity_loader_callback), &fcc);
11991193
}
12001194
RETURN_TRUE;

0 commit comments

Comments
 (0)