Fix leak when breaking out of FilesystemIterator

We need to always destroy current, not just when iter.data is not
set.

Take this opportunity to clean up the iterator destructor code a
bit, to remove redundant checks and incorrect comments.

1 files changed, 12 insertions, 0 deletions

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===