-
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.
Fix #78863: DirectoryIterator class silently truncates after a null byte
Since the constructor of DirectoryIterator and friends is supposed to accepts paths (i.e. strings without NUL bytes), we must not accept arbitrary strings. (cherry picked from commit a5a1596)
- Loading branch information
1 parent
315eae9
commit d74907b
Showing
2 changed files
with
33 additions
and
2 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
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,31 @@ | ||
--TEST-- | ||
Bug #78863 (DirectoryIterator class silently truncates after a null byte) | ||
--FILE-- | ||
<?php | ||
$dir = __DIR__ . '/bug78863'; | ||
mkdir($dir); | ||
touch("$dir/bad"); | ||
mkdir("$dir/sub"); | ||
touch("$dir/sub/good"); | ||
|
||
$it = new DirectoryIterator(__DIR__ . "/bug78863\0/sub"); | ||
foreach ($it as $fileinfo) { | ||
if (!$fileinfo->isDot()) { | ||
var_dump($fileinfo->getFilename()); | ||
} | ||
} | ||
?> | ||
--EXPECTF-- | ||
Fatal error: Uncaught UnexpectedValueException: DirectoryIterator::__construct() expects parameter 1 to be a valid path, string given in %s:%d | ||
Stack trace: | ||
#0 %s(%d): DirectoryIterator->__construct('%s') | ||
#1 {main} | ||
thrown in %s on line %d | ||
--CLEAN-- | ||
<?php | ||
$dir = __DIR__ . '/bug78863'; | ||
unlink("$dir/sub/good"); | ||
rmdir("$dir/sub"); | ||
unlink("$dir/bad"); | ||
rmdir($dir); | ||
?> |