archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Fix GH-17067: glob:// wrapper doesn't cater to CWD for ZTS builds
This commit is contained in:
Christoph M. Becker 2024-12-18 13:04:41 +01:00
commit 4dc055506c
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 60 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ext/standard/tests/streams/gh17067.phpt Normal file
View file

@ -0,0 +1,22 @@
--TEST--
GH-17067 (glob:// wrapper doesn't cater to CWD for ZTS builds)
--FILE--
<?php
$dir = __DIR__ . "/gh17067";
mkdir($dir);
touch("$dir/foo");
chdir($dir);
var_dump(scandir("glob://*"));
?>
--CLEAN--
<?php
$dir = __DIR__ . "/gh17067";
@unlink("$dir/foo");
@rmdir($dir);
?>
--EXPECT--
array(1) {
[0]=>
string(3) "foo"
}

39
main/streams/glob_wrapper.c
View file

@ -225,10 +225,32 @@ static php_stream *php_glob_stream_opener(php_stream_wrapper *wrapper, const cha
*opened_path = zend_string_init(path, strlen(path), 0); *opened_path = zend_string_init(path, strlen(path), 0);
} }
} }
const char *pattern = path;
#ifdef ZTS
char cwd[MAXPATHLEN];
char work_pattern[MAXPATHLEN];
char *result;
size_t cwd_skip = 0;
if (!IS_ABSOLUTE_PATH(path, strlen(path))) {
result = VCWD_GETCWD(cwd, MAXPATHLEN);
if (!result) {
cwd[0] = '\0';
}
# ifdef PHP_WIN32
if (IS_SLASH(*path)) {
cwd[2] = '\0';
}
# endif
cwd_skip = strlen(cwd)+1;
snprintf(work_pattern, MAXPATHLEN, "%s%c%s", cwd, DEFAULT_SLASH, path);
pattern = work_pattern;
}
#endif
pglob = ecalloc(1, sizeof(*pglob)); pglob = ecalloc(1, sizeof(*pglob));
if (0 != (ret = glob(path, pglob->flags & GLOB_FLAGMASK, NULL, &pglob->glob))) { if (0 != (ret = glob(pattern, pglob->flags & GLOB_FLAGMASK, NULL, &pglob->glob))) {
#ifdef GLOB_NOMATCH #ifdef GLOB_NOMATCH
if (GLOB_NOMATCH != ret) if (GLOB_NOMATCH != ret)
#endif #endif
@ -238,6 +260,21 @@ static php_stream *php_glob_stream_opener(php_stream_wrapper *wrapper, const cha
} }
} }
#ifdef ZTS
if (cwd_skip > 0) {
/* strip prepended CWD */
for (i = 0; i < pglob->glob.gl_pathc; i++) {
char *p = pglob->glob.gl_pathv[i];
char *q = p + cwd_skip;
char *e = p + strlen(pglob->glob.gl_pathv[i]) - 1;
while (q <= e) {
*p++ = *q++;
}
*p = '\0';
}
}
#endif
/* if open_basedir in use, check and filter restricted paths */ /* if open_basedir in use, check and filter restricted paths */
if ((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) { if ((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) {
pglob->open_basedir_used = true; pglob->open_basedir_used = true;