Skip to content

Fix GH-20678: resource created by GlobIterator crashes with fclose(). #20697

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

Closed
devnexen wants to merge 2 commits into from
+19 −0
Closed

Fix GH-20678: resource created by GlobIterator crashes with fclose(). #20697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b97b405
Fix GH-20678: resource created by GlobIterator crashes with fclose().
devnexen Dec 13, 2025
dc09366
add test
devnexen Dec 13, 2025
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/spl/spl_directory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,11 @@ static void spl_filesystem_dir_open(spl_filesystem_object* intern, zend_string *
intern->type = SPL_FS_DIR;
intern->u.dir.dirp = php_stream_opendir(ZSTR_VAL(path), REPORT_ERRORS, FG(default_context));

if (intern->u.dir.dirp) {
/* we prevent potential UAF with conflicting explicit fclose(), relying on the object destructor for this */
intern->u.dir.dirp->flags |= PHP_STREAM_FLAG_NO_FCLOSE;
}

if (ZSTR_LEN(path) > 1 && IS_SLASH_AT(ZSTR_VAL(path), ZSTR_LEN(path)-1)) {
intern->path = zend_string_init(ZSTR_VAL(path), ZSTR_LEN(path)-1, 0);
} else {
Expand Down
14 changes: 14 additions & 0 deletions ext/spl/tests/gh20678.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--TEST--
GH-20678 (resource created by GlobalIterator crashes when it is called with fclose())
--CREDITS--
chongwick
--FILE--
<?php
$iter = new GlobIterator(__DIR__ . '/*.abcdefghij');
$resources = get_resources();
$resource = end($resources);
fclose($resource);
?>
--EXPECTF--

Warning: fclose(): %d is not a valid stream resource in %s on line %d
Loading