Commit b6bd738e451 for php.net
commit b6bd738e451b4a52bba13a97bba9bbe0106ee30f
Merge: 4f983146688 b5bca194e7d
Author: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date: Tue Aug 11 19:01:51 2026 +0200
Merge branch 'PHP-8.5'
* PHP-8.5:
Add a stack limit check in php_count_recursive() (#23197)
diff --cc ext/standard/array.c
index 91d3932516e,fcc6b387966..648b4847909
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@@ -617,8 -681,12 +630,11 @@@ PHP_FUNCTION(count
cnt = zend_hash_num_elements(Z_ARRVAL_P(array));
} else {
cnt = php_count_recursive(Z_ARRVAL_P(array));
+ if (UNEXPECTED(cnt < 0)) {
+ RETURN_THROWS();
+ }
}
RETURN_LONG(cnt);
- break;
case IS_OBJECT: {
zval retval;
/* first, we check if the handler is defined */