Skip to content

Commit ed8d6b5

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Use standard error message for stack limit in serialize()
2 parents bb3a3d0 + 612a6ad commit ed8d6b5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/standard/tests/serialize/gh15169.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ try {
3131
echo $e->getMessage(), "\n";
3232
}
3333
?>
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?

ext/standard/var.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_
10521052
}
10531053

10541054
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();
10561056
return;
10571057
}
10581058

0 commit comments

Comments
 (0)