-
Notifications
You must be signed in to change notification settings - Fork 7.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed RecursiveDirectoryIterator with long path or with edge case length
The search path needs to be appended with the wild card. Till now, an edge case existed, so then if a path is 259 bytes long, which is smaller _MAX_PATH, the suffix would cause the final search path to become longer than _MAX_PATH. It is an edge case, when the starting path happens to have a specific length. If the starting path was longer than _MAX_PATH or the addition of "\\*" would not exceed _MAX_PATH, the function was correct. Except for rewind, which was broken in the case of the long path.
- Loading branch information
Showing
2 changed files
with
103 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
--TEST-- | ||
RecursiveDirectoryIterator with dir path long or of edge case length | ||
--SKIPIF-- | ||
<?php | ||
include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; | ||
|
||
skip_if_not_win(); | ||
|
||
if (strlen(dirname(__FILE__)) > 259) die("Unsuitable starting path length"); | ||
?> | ||
--FILE-- | ||
<?php | ||
|
||
$need_len = 1024; | ||
//$need_len = 259; | ||
$dir = dirname(__FILE__); | ||
while ($need_len - strlen($dir) > 32) { | ||
$dir .= DIRECTORY_SEPARATOR . str_repeat("a", 32); | ||
} | ||
$dir .= DIRECTORY_SEPARATOR . str_repeat("a", $need_len - strlen($dir)); | ||
mkdir($dir, 0700, true); | ||
|
||
$fl = $dir . DIRECTORY_SEPARATOR . "hello.txt"; | ||
file_put_contents($fl, ""); | ||
|
||
|
||
$start = substr($dir, 0, strpos($dir, DIRECTORY_SEPARATOR, strlen(dirname(__FILE__))+1)); | ||
$iter = new RecursiveIteratorIterator( | ||
new RecursiveDirectoryIterator( | ||
$start, | ||
FilesystemIterator::SKIP_DOTS | ||
), | ||
RecursiveIteratorIterator::CHILD_FIRST | ||
); | ||
|
||
foreach ($iter as $item) { | ||
if (!$item->isDir()) { | ||
var_dump($item->getPathname()); | ||
} | ||
} | ||
|
||
$iter->rewind(); | ||
foreach ($iter as $item) { | ||
if ($item->isDir()) { | ||
rmdir($item->getPathname()); | ||
} else { | ||
unlink($item->getPathname()); | ||
} | ||
} | ||
rmdir($start); | ||
var_dump(file_exists($start)); | ||
|
||
/*unlink($fl); | ||
do { | ||
rmdir($dir); | ||
$dir = dirname($dir); | ||
} while (dirname(__FILE__) != $dir);*/ | ||
|
||
?> | ||
==DONE== | ||
--EXPECTF-- | ||
string(%d) "%shello.txt" | ||
bool(false) | ||
==DONE== | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters