Merge branch 'PHP-8.1'

cmb69 · cmb69 · commit e5d9859b5026 · 2022-05-03T12:59:59.000+02:00
* PHP-8.1: Fix GH-8235: iterator_count() may run indefinitely
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
@@ -3181,6 +3181,9 @@ PHP_FUNCTION(iterator_to_array)
 
 static int spl_iterator_count_apply(zend_object_iterator *iter, void *puser) /* {{{ */
 {
+	if (UNEXPECTED(*(zend_long*)puser == ZEND_LONG_MAX)) {
+		return ZEND_HASH_APPLY_STOP;
+	}
 	(*(zend_long*)puser)++;
 	return ZEND_HASH_APPLY_KEEP;
 }

Original file line number	Diff line number	Diff line change
`@@ -3181,6 +3181,9 @@ PHP_FUNCTION(iterator_to_array)`
`3181`	`3181`
`3182`	`3182`	`static int spl_iterator_count_apply(zend_object_iterator iter, void puser) /* {{{ */`
`3183`	`3183`	`{`
	`3184`	`+ if (UNEXPECTED((zend_long)puser == ZEND_LONG_MAX)) {`
	`3185`	`+ return ZEND_HASH_APPLY_STOP;`
	`3186`	`+ }`
`3184`	`3187`	`((zend_long)puser)++;`
`3185`	`3188`	`return ZEND_HASH_APPLY_KEEP;`
`3186`	`3189`	`}`