Added missing set of fcc->initialized flag.

dstogov · dstogov · commit 66770f9c37e3 · 2015-09-01T03:15:50.000+03:00
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -2941,6 +2941,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
 			if (lmname != Z_STR_P(callable)) {
 				ZSTR_ALLOCA_FREE(lmname, use_heap);
 			}
+			fcc->initialized = 1;
 			return 1;
 		} else {
 			if (lmname == Z_STR_P(callable)) {
@@ -2951,6 +2952,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
 			zend_str_tolower(ZSTR_VAL(lmname), ZSTR_LEN(lmname));
 			if ((fcc->function_handler = zend_hash_find_ptr(EG(function_table), lmname)) != NULL) {
 				ZSTR_ALLOCA_FREE(lmname, use_heap);
+				fcc->initialized = 1;
 				return 1;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -2941,6 +2941,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca`
`2941`	`2941`	`if (lmname != Z_STR_P(callable)) {`
`2942`	`2942`	`ZSTR_ALLOCA_FREE(lmname, use_heap);`
`2943`	`2943`	`}`
	`2944`	`+ fcc->initialized = 1;`
`2944`	`2945`	`return 1;`
`2945`	`2946`	`} else {`
`2946`	`2947`	`if (lmname == Z_STR_P(callable)) {`
`@@ -2951,6 +2952,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca`
`2951`	`2952`	`zend_str_tolower(ZSTR_VAL(lmname), ZSTR_LEN(lmname));`
`2952`	`2953`	`if ((fcc->function_handler = zend_hash_find_ptr(EG(function_table), lmname)) != NULL) {`
`2953`	`2954`	`ZSTR_ALLOCA_FREE(lmname, use_heap);`
	`2955`	`+ fcc->initialized = 1;`
`2954`	`2956`	`return 1;`
`2955`	`2957`	`}`
`2956`	`2958`	`}`