Merge branch 'PHP-8.4'

ndossche · ndossche · commit ed8d6b5b2504 · 2024-10-04T20:10:04.000+02:00
* PHP-8.4:
  Use standard error message for stack limit in serialize()
diff --git a/ext/standard/tests/serialize/gh15169.phpt b/ext/standard/tests/serialize/gh15169.phpt
@@ -31,5 +31,5 @@ try {
     echo $e->getMessage(), "\n";
 }
 ?>
---EXPECT--
-Maximum call stack size reached. Infinite recursion?
+--EXPECTF--
+Maximum call stack size of %d bytes (zend.max_allowed_stack_size - zend.reserved_stack_size) reached. Infinite recursion?
diff --git a/ext/standard/var.c b/ext/standard/var.c
@@ -1052,7 +1052,7 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_
 	}
 
 	if (UNEXPECTED(php_serialize_check_stack_limit())) {
-		zend_throw_error(NULL, "Maximum call stack size reached. Infinite recursion?");
+		zend_call_stack_size_error();
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,5 @@ try {`
`31`	`31`	`echo $e->getMessage(), "\n";`
`32`	`32`	`}`
`33`	`33`	`?>`
`34`		`---EXPECT--`
`35`		`-Maximum call stack size reached. Infinite recursion?`
	`34`	`+--EXPECTF--`
	`35`	`+Maximum call stack size of %d bytes (zend.max_allowed_stack_size - zend.reserved_stack_size) reached. Infinite recursion?`
Original file line number	Diff line number	Diff line change
`@@ -1052,7 +1052,7 @@ static void php_var_serialize_intern(smart_str buf, zval struc, php_serialize_`
`1052`	`1052`	`}`
`1053`	`1053`
`1054`	`1054`	`if (UNEXPECTED(php_serialize_check_stack_limit())) {`
`1055`		`- zend_throw_error(NULL, "Maximum call stack size reached. Infinite recursion?");`
	`1055`	`+ zend_call_stack_size_error();`
`1056`	`1056`	`return;`
`1057`	`1057`	`}`
`1058`	`1058`