archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Fix regression on platforms without `ZEND_CHECK_STACK_LIMIT` set (8.4) (#16285)
This commit is contained in:
Calvin Buckley 2024-10-08 10:24:03 -03:00
commit 3d6b80a33c
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ext/standard/var.c
View file

@ -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) static zend_always_inline bool php_serialize_check_stack_limit(void)
{ {
#ifdef ZEND_CHECK_STACK_LIMIT #ifdef ZEND_CHECK_STACK_LIMIT
return zend_call_stack_overflowed(EG(stack_limit)); if (UNEXPECTED(zend_call_stack_overflowed(EG(stack_limit)))) {
#else zend_call_stack_size_error();
return false; return true;
}
#endif #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) /* {{{ */ static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_data_t var_hash, bool in_rcn_array, bool is_root) /* {{{ */
@ -1052,7 +1054,6 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_
} }
if (UNEXPECTED(php_serialize_check_stack_limit())) { if (UNEXPECTED(php_serialize_check_stack_limit())) {
zend_call_stack_size_error();
return; return;
} }