archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-8.0' into PHP-8.1

Browse source 
* PHP-8.0:
  Fix GH-8366: ArrayIterator may leak when calling __construct()
This commit is contained in:
Christoph M. Becker 2022-04-15 19:06:57 +02:00
commit 549cf3a24d
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

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

5
ext/spl/spl_array.c
View file

@ -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 &= ~SPL_ARRAY_IS_SELF & ~SPL_ARRAY_USE_OTHER;
intern->ar_flags |= ar_flags; 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;
}
} }
/* }}} */ /* }}} */

9
ext/spl/tests/gh8366.phpt Normal file
View file

@ -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--