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

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

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 |= 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;
}
}
/* }}} */