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

Fix GlobIterator without constructor breaks count() (#18314)

Browse Source 
As reported by OpenAI AARDVARK.
This commit is contained in:
Niels Dossche
2025-04-12 09:59:56 +02:00
committed by GitHub
parent fd7ebd4d15
commit 1684c52a88
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ext/spl/spl_directory.c
View File

@@ -1599,12 +1599,12 @@ PHP_METHOD(GlobIterator, count)
RETURN_THROWS();
}
/* The spl_filesystem_object_get_method_check() function is called prior to calling this function.
* Therefore, the directory entry cannot be NULL. However, if it is not NULL, then it must be a glob iterator
* by construction. */
ZEND_ASSERT(spl_intern_is_glob(intern));
RETURN_LONG(php_glob_stream_get_count(intern->u.dir.dirp, NULL));
if (EXPECTED(spl_intern_is_glob(intern))) {
RETURN_LONG(php_glob_stream_get_count(intern->u.dir.dirp, NULL));
} else {
/* This can happen by avoiding constructors in specially-crafted code. */
zend_throw_error(NULL, "GlobIterator is not initialized");
}
}
/* }}} */
#endif /* HAVE_GLOB */

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

@@ -0,0 +1,14 @@
--TEST--
GlobIterator without constructor breaks count()
--FILE--
<?php
$rc = new ReflectionClass(GlobIterator::class);
$in = $rc->newInstanceWithoutConstructor();
try {
count($in);
} catch (Error $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECT--
GlobIterator is not initialized