Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix GH-8366: ArrayIterator may leak when calling __construct()

Author: cmb69

NEWS

@@ -26,6 +26,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-8267 (MySQLi uses unsupported format specifier on Windows).
     (cmb)
 
+- SPL:
+  . Fixed bug GH-8366 (ArrayIterator may leak when calling __construct()).
+    (cmb)
+
 - Streams:
   . Fixed php://temp does not preserve file-position when switched to temporary
     file. (Bernd Holzmüller)

ext/spl/spl_array.c

@@ -1088,7 +1088,10 @@ static void spl_array_set_array(zval *object, spl_array_object *intern, zval *ar
 
 	intern->ar_flags &= ~SPL_ARRAY_IS_SELF & ~SPL_ARRAY_USE_OTHER;
 	intern->ar_flags |= ar_flags;
-	intern->ht_iter = (uint32_t)-1;
+	if (intern->ht_iter != (uint32_t)-1) {
+		zend_hash_iterator_del(intern->ht_iter);
+		intern->ht_iter = (uint32_t)-1;
+	}
 }
 /* }}} */
 

ext/spl/tests/gh8366.phpt

@@ -0,0 +1,9 @@
+--TEST--
+Bug GH-8366 (ArrayIterator may leak when calling __construct())
+--FILE--
+<?php
+$it = new \ArrayIterator();
+foreach ($it as $elt) {}
+$it->__construct([]);
+?>
+--EXPECT--