Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS)

laruence · laruence · commit 01ae5c3c2ff4 · 2013-02-17T11:04:36.000+08:00
diff --git a/NEWS b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2013, PHP 5.3.23
 
+- SPL:
+  . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS).
+    (patch by kriss@krizalys.com, Laruence)
+
 
 ?? ??? 2013, PHP 5.3.22
 
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
@@ -1431,6 +1431,7 @@ SPL_METHOD(FilesystemIterator, __construct)
 SPL_METHOD(FilesystemIterator, rewind)
 {
 	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	int skip_dots = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_SKIPDOTS);
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -1442,7 +1443,7 @@ SPL_METHOD(FilesystemIterator, rewind)
 	}
 	do {
 		spl_filesystem_dir_read(intern TSRMLS_CC);
-	} while (spl_filesystem_is_dot(intern->u.dir.entry.d_name));
+	} while (skip_dots && spl_filesystem_is_dot(intern->u.dir.entry.d_name));
 }
 /* }}} */
 
diff --git a/ext/spl/tests/bug64228.phpt b/ext/spl/tests/bug64228.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS)
+--FILE--
+<?php
+$dirs = array();
+$empty_dir = __DIR__ . "/empty";
+@mkdir($empty_dir);
+
+$i = new RecursiveDirectoryIterator($empty_dir, FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO); // Note the absence of FilesystemIterator::SKIP_DOTS
+foreach ($i as $key => $value) {
+    $dirs[] = $value->getFileName();
+}
+
+@rmdir($empty_dir);
+
+sort($dirs);
+print_r($dirs);
+?>
+--EXPECT--
+Array
+(
+    [0] => .
+    [1] => ..
+)
+

Original file line number	Diff line number	Diff line change
`@@ -1431,6 +1431,7 @@ SPL_METHOD(FilesystemIterator, __construct)`
`1431`	`1431`	`SPL_METHOD(FilesystemIterator, rewind)`
`1432`	`1432`	`{`
`1433`	`1433`	`spl_filesystem_object intern = (spl_filesystem_object)zend_object_store_get_object(getThis() TSRMLS_CC);`
	`1434`	`+ int skip_dots = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_SKIPDOTS);`
`1434`	`1435`
`1435`	`1436`	`if (zend_parse_parameters_none() == FAILURE) {`
`1436`	`1437`	`return;`
`@@ -1442,7 +1443,7 @@ SPL_METHOD(FilesystemIterator, rewind)`
`1442`	`1443`	`}`
`1443`	`1444`	`do {`
`1444`	`1445`	`spl_filesystem_dir_read(intern TSRMLS_CC);`
`1445`		`- } while (spl_filesystem_is_dot(intern->u.dir.entry.d_name));`
	`1446`	`+ } while (skip_dots && spl_filesystem_is_dot(intern->u.dir.entry.d_name));`
`1446`	`1447`	`}`
`1447`	`1448`	`/* }}} */`
`1448`	`1449`