Merge branch 'PHP-7.1' into PHP-7.2

Julien Pauli · Julien Pauli · commit 4f06b6278193 · 2017-08-01T16:02:36.000+02:00
* PHP-7.1:
  Updated NEWS
  Updated NEWS
  Fix #75015. Crash in SPL destructors
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -941,6 +941,7 @@ static void spl_RecursiveIteratorIterator_free_storage(zend_object *_object)`
`941`	`941`	`if (object->iterators) {`
`942`	`942`	`efree(object->iterators);`
`943`	`943`	`object->iterators = NULL;`
	`944`	`+ object->level = 0;`
`944`	`945`	`}`
`945`	`946`
`946`	`947`	`zend_object_std_dtor(&object->std);`