mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Merge branch 'PHP-8.3' into PHP-8.4
This commit is contained in:
commit
6a0035b7f4
2 changed files with 50 additions and 1 deletions
|
@ -636,7 +636,7 @@ static inline HashTable *spl_filesystem_object_get_debug_info(zend_object *objec
|
|||
}
|
||||
if (intern->type == SPL_FS_DIR) {
|
||||
#ifdef HAVE_GLOB
|
||||
if (php_stream_is(intern->u.dir.dirp, &php_glob_stream_ops)) {
|
||||
if (intern->u.dir.dirp && php_stream_is(intern->u.dir.dirp ,&php_glob_stream_ops)) {
|
||||
ZVAL_STR_COPY(&tmp, intern->path);
|
||||
} else {
|
||||
ZVAL_FALSE(&tmp);
|
||||
|
|
49
ext/spl/tests/gh14687.phpt
Normal file
49
ext/spl/tests/gh14687.phpt
Normal file
|
@ -0,0 +1,49 @@
|
|||
--TEST--
|
||||
GH-14687 segfault on debugging SplObjectStorage instance after __destruct.
|
||||
--CREDITS--
|
||||
YuanchengJiang
|
||||
--EXTENSIONS--
|
||||
phar
|
||||
--INI--
|
||||
phar.require_hash=0
|
||||
phar.readonly=0
|
||||
--FILE--
|
||||
<?php
|
||||
$fname = __DIR__ . '/gh14687.phar.zip';
|
||||
$phar = new Phar($fname);
|
||||
class HasDestructor {
|
||||
public function __destruct() {
|
||||
var_dump($GLOBALS['s']);
|
||||
}
|
||||
}
|
||||
$s = new SplObjectStorage();
|
||||
$s[$phar] = new HasDestructor();
|
||||
register_shutdown_function(function() {
|
||||
global $s;
|
||||
});
|
||||
?>
|
||||
--CLEAN--
|
||||
<?php
|
||||
@unlink(__DIR__ . '/gh14687.phar.zip');
|
||||
?>
|
||||
--EXPECT--
|
||||
object(SplObjectStorage)#2 (1) {
|
||||
["storage":"SplObjectStorage":private]=>
|
||||
array(1) {
|
||||
[0]=>
|
||||
array(2) {
|
||||
["obj"]=>
|
||||
object(Phar)#1 (3) {
|
||||
["pathName":"SplFileInfo":private]=>
|
||||
string(0) ""
|
||||
["glob":"DirectoryIterator":private]=>
|
||||
bool(false)
|
||||
["subPathName":"RecursiveDirectoryIterator":private]=>
|
||||
string(0) ""
|
||||
}
|
||||
["inf"]=>
|
||||
object(HasDestructor)#3 (0) {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue