Skip to content

ext/standard: Validate scandir() sorting_order parameter #21203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arshidkv12 wants to merge 7 commits into
base: master
Choose a base branch
from
+84 −95
Open

ext/standard: Validate scandir() sorting_order parameter #21203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
da0c65e
ext/standard: Validate scandir() sorting_order parameter
arshidkv12 Feb 11, 2026
6341dd6
ext/standard: Validate scandir() sorting_order parameter
arshidkv12 Feb 11, 2026
b4ceb2c
ext/standard: Validate scandir() sorting_order parameter
arshidkv12 Feb 11, 2026
e3f430b
ext/standard: Validate scandir() sorting_order parameter
arshidkv12 Feb 11, 2026
08b58e0
ext/standard: Validate scandir() sorting_order parameter
arshidkv12 Feb 11, 2026
0286ea0
ext/standard: Validate scandir() sorting_order parameter
arshidkv12 Feb 11, 2026
90414b7
ext/standard: Validate scandir() sorting_order parameter
arshidkv12 Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ext/standard/dir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,11 @@ PHP_FUNCTION(scandir)
Z_PARAM_RESOURCE_OR_NULL(zcontext)
ZEND_PARSE_PARAMETERS_END();

if (flags != PHP_SCANDIR_SORT_ASCENDING && flags != PHP_SCANDIR_SORT_NONE) {
zend_argument_value_error(2, "must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE");
RETURN_THROWS();
}

if (dirn_len < 1) {
zend_argument_must_not_be_empty_error(1);
RETURN_THROWS();
Expand Down
19 changes: 6 additions & 13 deletions ext/standard/tests/dir/scandir_basic-win32-mb.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ var_dump(scandir($directory));
echo "\n-- scandir() with all arguments --\n";
$sorting_order = SCANDIR_SORT_DESCENDING;
$context = stream_context_create();
var_dump(scandir($directory, $sorting_order, $context));
try {
var_dump(scandir($directory, $sorting_order, $context));
} catch (ValueError $e) {
echo $e->getMessage();
}

delete_files($directory, 3, "私はガラスを食べられますfile");
?>
Expand All @@ -55,15 +59,4 @@ array(5) {
}

-- scandir() with all arguments --
array(5) {
[0]=>
string(45) "私はガラスを食べられますfile3.tmp"
[1]=>
string(45) "私はガラスを食べられますfile2.tmp"
[2]=>
string(45) "私はガラスを食べられますfile1.tmp"
[3]=>
string(2) ".."
[4]=>
string(1) "."
}
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
20 changes: 6 additions & 14 deletions ext/standard/tests/dir/scandir_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@ var_dump(scandir($directory));
echo "\n-- scandir() with all arguments --\n";
$sorting_order = SCANDIR_SORT_DESCENDING;
$context = stream_context_create();
var_dump(scandir($directory, $sorting_order, $context));

try {
var_dump(scandir($directory, $sorting_order, $context));
} catch (ValueError $e) {
echo $e->getMessage();
}
delete_files($directory, 3);
?>
--CLEAN--
Expand All @@ -49,15 +52,4 @@ array(5) {
}

-- scandir() with all arguments --
array(5) {
[0]=>
string(9) "file3.tmp"
[1]=>
string(9) "file2.tmp"
[2]=>
string(9) "file1.tmp"
[3]=>
string(2) ".."
[4]=>
string(1) "."
}
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
39 changes: 39 additions & 0 deletions ext/standard/tests/dir/scandir_invalid_flag.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
--TEST--
scandir() flag validation and behavior
--FILE--
<?php

echo "== Valid flags ==\n";

$valid_flags = [
SCANDIR_SORT_ASCENDING,
SCANDIR_SORT_NONE,
];

foreach ($valid_flags as $flag) {
$result = scandir(__DIR__, $flag);
echo is_array($result) ? "OK\n" : "FAIL\n";
}

echo "== Invalid flags ==\n";

$invalid_flags = [-1, 3, 999, PHP_INT_MAX];

foreach ($invalid_flags as $flag) {
try {
scandir(__DIR__, $flag);
} catch (ValueError $e) {
echo $e->getMessage() . PHP_EOL;
}
}

?>
--EXPECT--
== Valid flags ==
OK
OK
== Invalid flags ==
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
20 changes: 7 additions & 13 deletions ext/standard/tests/dir/scandir_variation10-win32-mb.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,12 @@ mkdir($dir);
@create_files($dir, 2, "numeric", 0755, 1, "w", "私はガラスを食べられますfile");

// Deterministic tests.
var_dump(scandir($dir, SCANDIR_SORT_ASCENDING));
var_dump(scandir($dir, SCANDIR_SORT_DESCENDING));
try {
var_dump(scandir($dir, SCANDIR_SORT_ASCENDING));
var_dump(scandir($dir, SCANDIR_SORT_DESCENDING));
} catch (ValueError $e) {
echo $e->getMessage();
}

// Non-deterministic tests.
$files = scandir($dir, SCANDIR_SORT_NONE);
Expand Down Expand Up @@ -61,17 +65,7 @@ array(4) {
[3]=>
string(45) "私はガラスを食べられますfile2.tmp"
}
array(4) {
[0]=>
string(45) "私はガラスを食べられますfile2.tmp"
[1]=>
string(45) "私はガラスを食べられますfile1.tmp"
[2]=>
string(2) ".."
[3]=>
string(1) "."
}
int(4)
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONEint(4)
bool(true)
bool(true)
bool(true)
Expand Down
20 changes: 7 additions & 13 deletions ext/standard/tests/dir/scandir_variation10.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@ mkdir($dir);
@create_files($dir, 2);

// Deterministic tests.
var_dump(scandir($dir, SCANDIR_SORT_ASCENDING));
var_dump(scandir($dir, SCANDIR_SORT_DESCENDING));
try {
var_dump(scandir($dir, SCANDIR_SORT_ASCENDING));
var_dump(scandir($dir, SCANDIR_SORT_DESCENDING));
} catch (ValueError $e) {
echo $e->getMessage();
}

// Non-deterministic tests.
$files = scandir($dir, SCANDIR_SORT_NONE);
Expand Down Expand Up @@ -55,17 +59,7 @@ array(4) {
[3]=>
string(9) "file2.tmp"
}
array(4) {
[0]=>
string(9) "file2.tmp"
[1]=>
string(9) "file1.tmp"
[2]=>
string(2) ".."
[3]=>
string(1) "."
}
int(4)
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONEint(4)
bool(true)
bool(true)
bool(true)
Expand Down
26 changes: 6 additions & 20 deletions ext/standard/tests/dir/scandir_variation9-win32-mb.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ mkdir($dir);
$ints = array (PHP_INT_MAX, -PHP_INT_MAX, 0);

foreach($ints as $sorting_order) {
try {
var_dump( scandir($dir, $sorting_order) );
} catch (ValueError $e) {
echo $e->getMessage() . PHP_EOL;
}
}

delete_files($dir, 2, "私はガラスを食べられますfile");
Expand All @@ -39,26 +43,8 @@ rmdir($dir);
?>
--EXPECT--
*** Testing scandir() : usage variations ***
array(4) {
[0]=>
string(45) "私はガラスを食べられますfile2.tmp"
[1]=>
string(45) "私はガラスを食べられますfile1.tmp"
[2]=>
string(2) ".."
[3]=>
string(1) "."
}
array(4) {
[0]=>
string(45) "私はガラスを食べられますfile2.tmp"
[1]=>
string(45) "私はガラスを食べられますfile1.tmp"
[2]=>
string(2) ".."
[3]=>
string(1) "."
}
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
array(4) {
[0]=>
string(1) "."
Expand Down
30 changes: 8 additions & 22 deletions ext/standard/tests/dir/scandir_variation9.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ mkdir($dir);
$ints = array (PHP_INT_MAX, -PHP_INT_MAX, 0);

foreach($ints as $sorting_order) {
var_dump( scandir($dir, $sorting_order) );
try {
var_dump( scandir($dir, $sorting_order) );
} catch (ValueError $e) {
echo $e->getMessage() . PHP_EOL;
}
}

delete_files($dir, 2);
Expand All @@ -31,28 +35,10 @@ delete_files($dir, 2);
$dir = __DIR__ . '/scandir_variation9';
rmdir($dir);
?>
--EXPECT--
--EXPECTF--
*** Testing scandir() : usage variations ***
array(4) {
[0]=>
string(9) "file2.tmp"
[1]=>
string(9) "file1.tmp"
[2]=>
string(2) ".."
[3]=>
string(1) "."
}
array(4) {
[0]=>
string(9) "file2.tmp"
[1]=>
string(9) "file1.tmp"
[2]=>
string(2) ".."
[3]=>
string(1) "."
}
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
scandir(): Argument #2 ($sorting_order) must be one of PHP_SCANDIR_SORT_ASCENDING, or SCANDIR_SORT_NONE
array(4) {
[0]=>
string(1) "."
Expand Down
Loading