- Fix "f" modifier for zend_parse_parameters_ex in case of a __call call

  (fixes Zend/tests/bug19859.phpt and Zend/tests/bug34260.phpt)

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 111395decf6c5e848da294c9b5e71bc9da647241..df54e3b0fd9fc48f9488787ec775a361f97ad554 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2867,17 +2867,24 @@ ZEND_API int zend_fcall_info_init(zval *callable, zend_fcall_info *fci, zend_fca
        fci->size = sizeof(*fci);
        fci->function_table = ce ? &ce->function_table : EG(function_table);
        fci->object_pp = obj;
-       fci->function_name = NULL;
+       fci->function_name = callable;
        fci->retval_ptr_ptr = NULL;
        fci->param_count = 0;
        fci->params = NULL;
        fci->no_separation = 1;
        fci->symbol_table = NULL;
 
-       fcc->initialized = 1;
-       fcc->function_handler = func;
-       fcc->calling_scope = ce;
-       fcc->object_pp = obj;
+       if (ZEND_U_EQUAL(ZEND_STR_TYPE, func->common.function_name, USTR_LEN(func->common.function_name), ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)-1)) { 
+               fcc->initialized = 0;
+               fcc->function_handler = NULL;
+               fcc->calling_scope = NULL;
+               fcc->object_pp = NULL;
+       } else {
+               fcc->initialized = 1;
+               fcc->function_handler = func;
+               fcc->calling_scope = ce;
+               fcc->object_pp = obj;
+       }
 
        return SUCCESS;
 }