summaryrefslogtreecommitdiff
path: root/ext/spl
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2017-08-01 16:03:09 +0200
committerJulien Pauli <jpauli@php.net>2017-08-01 16:03:09 +0200
commitd8aa438b6788c8b738480ea58c82218652e09c31 (patch)
tree4d997d5187ffb296b08cc144fba058dafc54bc6a /ext/spl
parent39fec18c9cdf1e92e2ace21854f99aad1bc9a2ed (diff)
parent5069d521893fe549126eccc35f7c69def04f1e84 (diff)
downloadphp-git-d8aa438b6788c8b738480ea58c82218652e09c31.tar.gz
Merge branch 'PHP-7.2'
* PHP-7.2: Updated NEWS Updated NEWS Updated NEWS Fix #75015. Crash in SPL destructors
Diffstat (limited to 'ext/spl')
-rw-r--r--ext/spl/spl_iterators.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 371da80924..e789a21d41 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -941,6 +941,7 @@ static void spl_RecursiveIteratorIterator_free_storage(zend_object *_object)
if (object->iterators) {
efree(object->iterators);
object->iterators = NULL;
+ object->level = 0;
}
zend_object_std_dtor(&object->std);