Merge branch 'PHP-7.0' into PHP-7.1

Julien Pauli · Julien Pauli · commit cd06b5af09e6 · 2017-08-01T16:02:00.000+02:00
* PHP-7.0:
  Updated NEWS
  Fix #75015. Crash in SPL destructors
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
@@ -942,6 +942,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
`@@ -942,6 +942,7 @@ static void spl_RecursiveIteratorIterator_free_storage(zend_object *_object)`
`942`	`942`	`if (object->iterators) {`
`943`	`943`	`efree(object->iterators);`
`944`	`944`	`object->iterators = NULL;`
	`945`	`+ object->level = 0;`
`945`	`946`	`}`
`946`	`947`
`947`	`948`	`zend_object_std_dtor(&object->std);`