Merge branch 'PHP-8.3'

dstogov · dstogov · commit 8e93eb2e79ce · 2024-07-24T08:21:48.000+03:00
* PHP-8.3: Workaraound against false positive GCC array bounds error (#15078)
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -2751,8 +2751,8 @@ static void zend_check_magic_method_no_return_type(
 
 ZEND_API void zend_check_magic_method_implementation(const zend_class_entry *ce, const zend_function *fptr, zend_string *lcname, int error_type) /* {{{ */
 {
-	if (ZSTR_VAL(fptr->common.function_name)[0] != '_'
-	 || ZSTR_VAL(fptr->common.function_name)[1] != '_') {
+	if (ZSTR_VAL(lcname)[0] != '_'
+	 || ZSTR_VAL(lcname)[1] != '_') {
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2751,8 +2751,8 @@ static void zend_check_magic_method_no_return_type(`
`2751`	`2751`
`2752`	`2752`	`ZEND_API void zend_check_magic_method_implementation(const zend_class_entry ce, const zend_function fptr, zend_string lcname, int error_type) / {{{ */`
`2753`	`2753`	`{`
`2754`		`- if (ZSTR_VAL(fptr->common.function_name)[0] != '_'`
`2755`		`- \|\| ZSTR_VAL(fptr->common.function_name)[1] != '_') {`
	`2754`	`+ if (ZSTR_VAL(lcname)[0] != '_'`
	`2755`	`+ \|\| ZSTR_VAL(lcname)[1] != '_') {`
`2756`	`2756`	`return;`
`2757`	`2757`	`}`
`2758`	`2758`