php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Fix GH-20678: resource created by GlobIterator crashes with fclose().
This commit is contained in:
David Carlier
2025-12-14 11:59:14 +00:00
parent d28b13c8d9 90475249dd
commit 4d680fa1e2
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/spl/spl_directory.c
View File

@@ -292,6 +292,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 {

14
ext/spl/tests/gh20678.phpt Normal file
View File

@@ -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