From 44a80b64b918ff64a4e5bbcef43f00dfe0fcde27 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 15 Feb 2021 10:36:48 +0100 Subject: 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. --- ext/spl/spl_directory.c | 22 +++------------------- ext/spl/tests/filesystemiterator_leak.phpt | 12 ++++++++++++ 2 files changed, 15 insertions(+), 19 deletions(-) create mode 100644 ext/spl/tests/filesystemiterator_leak.phpt diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 6fec6d2e25..daed72d847 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -1677,15 +1677,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); } /* }}} */ @@ -1747,16 +1739,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-- + +===DONE=== +--EXPECT-- +===DONE=== -- cgit v1.2.1