Merge branch 'PHP-8.2' into PHP-8.3

dstogov · dstogov · commit 1511172b1b47 · 2024-07-24T08:21:37.000+03:00
* PHP-8.2: Workaraound against false positive GCC array bounds error (#15078)
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -2635,8 +2635,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
`@@ -2635,8 +2635,8 @@ static void zend_check_magic_method_no_return_type(`
`2635`	`2635`
`2636`	`2636`	`ZEND_API void zend_check_magic_method_implementation(const zend_class_entry ce, const zend_function fptr, zend_string lcname, int error_type) / {{{ */`
`2637`	`2637`	`{`
`2638`		`- if (ZSTR_VAL(fptr->common.function_name)[0] != '_'`
`2639`		`- \|\| ZSTR_VAL(fptr->common.function_name)[1] != '_') {`
	`2638`	`+ if (ZSTR_VAL(lcname)[0] != '_'`
	`2639`	`+ \|\| ZSTR_VAL(lcname)[1] != '_') {`
`2640`	`2640`	`return;`
`2641`	`2641`	`}`
`2642`	`2642`