Skip to content

Fix regression on platforms without ZEND_CHECK_STACK_LIMIT set (8.4) #16285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 8, 2024
Merged

Fix regression on platforms without ZEND_CHECK_STACK_LIMIT set (8.4) #16285

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a79e03
Fix regression on platforms without ZEND_CHECK_STACK_LIMIT set
NattyNarwhal Oct 7, 2024
d8adb01
Merge ifdef check for stack size check
NattyNarwhal Oct 7, 2024
1f39223
Fix control flow by changing ifdef
NattyNarwhal Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ext/standard/var.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,10 +1036,12 @@ static void php_var_serialize_class(smart_str *buf, zval *struc, HashTable *ht,
static zend_always_inline bool php_serialize_check_stack_limit(void)
{
#ifdef ZEND_CHECK_STACK_LIMIT
return zend_call_stack_overflowed(EG(stack_limit));
#else
return false;
if (UNEXPECTED(zend_call_stack_overflowed(EG(stack_limit)))) {
zend_call_stack_size_error();
return true;
}
#endif
return false;
}

static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_data_t var_hash, bool in_rcn_array, bool is_root) /* {{{ */
Expand All @@ -1052,7 +1054,6 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_
}

if (UNEXPECTED(php_serialize_check_stack_limit())) {
zend_call_stack_size_error();
return;
}

Expand Down