Skip to content

Fix GH-12721: SplFileInfo::getFilename() segfault in combination with… #12722

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
wants to merge 2 commits into from
Closed

Fix GH-12721: SplFileInfo::getFilename() segfault in combination with… #12722

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
b3cd7a5
Fix GH-12721: SplFileInfo::getFilename() segfault in combination with…
nielsdos Nov 18, 2023
7203a95
Fix Windows
nielsdos Nov 18, 2023
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
15 changes: 10 additions & 5 deletions ext/spl/spl_directory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,15 +925,16 @@ PHP_METHOD(SplFileInfo, getFilename)

path = spl_filesystem_object_get_path(intern);

ZEND_ASSERT(path);
if (path && ZSTR_LEN(path) && ZSTR_LEN(path) < ZSTR_LEN(intern->file_name)) {
/* +1 to skip the trailing / of the path in the file name */
size_t path_len = ZSTR_LEN(path) + 1;
RETVAL_STRINGL(ZSTR_VAL(intern->file_name) + path_len, ZSTR_LEN(intern->file_name) - path_len);
} else {
RETVAL_STR_COPY(intern->file_name);
}
zend_string_release_ex(path, /* persistent */ false);
if (path) {
zend_string_release_ex(path, /* persistent */ false);
}
}
/* }}} */

Expand Down Expand Up @@ -973,14 +974,16 @@ PHP_METHOD(SplFileInfo, getExtension)

path = spl_filesystem_object_get_path(intern);

if (ZSTR_LEN(path) && ZSTR_LEN(path) < ZSTR_LEN(intern->file_name)) {
if (path && ZSTR_LEN(path) && ZSTR_LEN(path) < ZSTR_LEN(intern->file_name)) {
fname = ZSTR_VAL(intern->file_name) + ZSTR_LEN(path) + 1;
flen = ZSTR_LEN(intern->file_name) - (ZSTR_LEN(path) + 1);
} else {
fname = ZSTR_VAL(intern->file_name);
flen = ZSTR_LEN(intern->file_name);
}
zend_string_release_ex(path, /* persistent */ false);
if (path) {
zend_string_release_ex(path, /* persistent */ false);
}

ret = php_basename(fname, flen, NULL, 0);

Expand Down Expand Up @@ -1052,7 +1055,9 @@ PHP_METHOD(SplFileInfo, getBasename)
fname = ZSTR_VAL(intern->file_name);
flen = ZSTR_LEN(intern->file_name);
}
zend_string_release_ex(path, /* persistent */ false);
if (path) {
zend_string_release_ex(path, /* persistent */ false);
}

RETURN_STR(php_basename(fname, flen, suffix, slen));
}
Expand Down
51 changes: 51 additions & 0 deletions ext/spl/tests/gh12721.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
--TEST--
GH-12721 (SplFileInfo::getFilename() segfault in combination with GlobIterator and no directory separator)
--FILE--
<?php

file_put_contents('file1.gh12721', 'hello');

echo "--- No slash ---\n";

foreach (new GlobIterator('*.gh12721') as $fileInfo) {
echo $fileInfo->getFilename(), "\n";
echo $fileInfo->getExtension(), "\n";
echo $fileInfo->getBasename(), "\n";
var_dump($fileInfo->getFileInfo());
}

echo "--- With slash ---\n";

foreach (new GlobIterator('./*.gh12721') as $fileInfo) {
echo $fileInfo->getFilename(), "\n";
echo $fileInfo->getExtension(), "\n";
echo $fileInfo->getBasename(), "\n";
var_dump($fileInfo->getFileInfo());
}

?>
--CLEAN--
<?php
@unlink('file1.gh12721');
?>
--EXPECTF--
--- No slash ---
file1.gh12721
gh12721
file1.gh12721
object(SplFileInfo)#4 (2) {
["pathName":"SplFileInfo":private]=>
string(13) "file1.gh12721"
["fileName":"SplFileInfo":private]=>
string(13) "file1.gh12721"
}
--- With slash ---
file1.gh12721
gh12721
file1.gh12721
object(SplFileInfo)#3 (2) {
["pathName":"SplFileInfo":private]=>
string(15) "%sfile1.gh12721"
["fileName":"SplFileInfo":private]=>
string(13) "file1.gh12721"
}