]> granicus.if.org Git - php/commitdiff
- Fixed bug #49608 (Using CachingIterator on DirectoryIterator instance segfaults)
authorFelipe Pena <felipe@php.net>
Tue, 8 Mar 2011 19:56:29 +0000 (19:56 +0000)
committerFelipe Pena <felipe@php.net>
Tue, 8 Mar 2011 19:56:29 +0000 (19:56 +0000)
ext/spl/spl_directory.c

index d764c927c7c18347aed3cef21b46ab61c26536fb..b1beae753dbe0203003a1d60a15638ff22b09c09 100755 (executable)
@@ -1598,7 +1598,9 @@ static void spl_filesystem_dir_it_dtor(zend_object_iterator *iter TSRMLS_DC)
 
        iterator->intern.data = NULL; /* mark as unused */
        zval_ptr_dtor(&iterator->current);
-       zval_ptr_dtor(&zfree);
+       if (zfree) {
+               zval_ptr_dtor(&zfree);
+       }
 }
 /* }}} */