Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix leak when breaking out of FilesystemIterator

2 files changed, 15 insertions, 19 deletions

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index b7a835ae45..236e98b6b4 100644
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -1643,15 +1643,7 @@ zend_object_iterator *spl_filesystem_dir_get_iterator(zend_class_entry *ce, zval
 static void spl_filesystem_dir_it_dtor(zend_object_iterator *iter)
 {
 	spl_filesystem_iterator *iterator = (spl_filesystem_iterator *)iter;
-
-	if (!Z_ISUNDEF(iterator->intern.data)) {
-		zval *object = &iterator->intern.data;
-		zval_ptr_dtor(object);
-	}
-	/* Otherwise we were called from the owning object free storage handler as
-	 * it sets iterator->intern.data to IS_UNDEF.
-	 * We don't even need to destroy iterator->current as we didn't add a
-	 * reference to it in move_forward or get_iterator */
+	zval_ptr_dtor(&iterator->intern.data);
 }
 /* }}} */
 
@@ -1713,16 +1705,8 @@ static void spl_filesystem_dir_it_rewind(zend_object_iterator *iter)
 static void spl_filesystem_tree_it_dtor(zend_object_iterator *iter)
 {
 	spl_filesystem_iterator *iterator = (spl_filesystem_iterator *)iter;
-
-	if (!Z_ISUNDEF(iterator->intern.data)) {
-		zval *object = &iterator->intern.data;
-		zval_ptr_dtor(object);
-	} else {
-		if (!Z_ISUNDEF(iterator->current)) {
-			zval_ptr_dtor(&iterator->current);
-			ZVAL_UNDEF(&iterator->current);
-		}
-	}
+	zval_ptr_dtor(&iterator->intern.data);
+	zval_ptr_dtor(&iterator->current);
 }
 /* }}} */
 
diff --git a/ext/spl/tests/filesystemiterator_leak.phpt b/ext/spl/tests/filesystemiterator_leak.phpt
new file mode 100644
index 0000000000..9cdaeaaa3a
--- /dev/null
+++ b/ext/spl/tests/filesystemiterator_leak.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Don't leak when breaking from FilesystemIterator
+--FILE--
+<?php
+$iterator = new FilesystemIterator(__DIR__);
+foreach ($iterator as $value) {
+    break;
+}
+?>
+===DONE===
+--EXPECT--
+===DONE===