Merge branch 'PHP-7.3' into PHP-7.4

This commit is contained in:
Nikita Popov 2019-02-11 11:33:18 +01:00
commit 52c2d47c90
2 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,32 @@
--TEST--
Bug #77552 Unintialized php_stream_statbuf in stat functions
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) != 'WIN') {
die('skip windows only test');
}
?>
--FILE--
<?php
// Check lstat on a Windows junction to ensure that st_mode is zero
$tmpDir = __DIR__.'/test-bug77552';
$target = $tmpDir.'/folder/target';
mkdir($target, 0777, true);
$junction = $tmpDir.'/junction';
$cmd = sprintf('mklink /J "%s" "%s"', $junction, $target);
exec($cmd);
$stat = lstat($junction);
var_dump($stat['mode']);
?>
--CLEAN--
<?php
$tmpDir = __DIR__.'/test-bug77552';
$cmd = sprintf('rmdir /S /Q "%s"', $tmpDir);
exec($cmd);
?>
--EXPECT--
int(0)

View File

@ -1888,6 +1888,8 @@ PHPAPI int _php_stream_stat_path(const char *path, int flags, php_stream_statbuf
const char *path_to_open = path;
int ret;
memset(ssb, 0, sizeof(*ssb));
if (!(flags & PHP_STREAM_URL_STAT_NOCACHE)) {
/* Try to hit the cache first */
if (flags & PHP_STREAM_URL_STAT_LINK) {