Skip to content

Fixed bug #77978 #4160

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 1 commit into from
Closed

Fixed bug #77978 #4160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions ext/zip/php_zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,13 @@ static char * php_zip_make_relative_path(char *path, size_t path_len) /* {{{ */
return path + 1;
}

#ifdef PHP_WIN32
/* Windows relative path ^A-Z: */
if (path_len > 2 && path[1] == ':' && !IS_SLASH(path[2])) {
return path + 2;
}
#endif /* PHP_WIN32 */

i = path_len;

while (1) {
Expand All @@ -121,8 +128,17 @@ static char * php_zip_make_relative_path(char *path, size_t path_len) /* {{{ */
return path;
}

if (i >= 2 && (path[i -1] == '.' || path[i -1] == ':')) {
/* i is the position of . or :, add 1 for / */
/* relative path indicators: ^../ ^./ /../ /./ and A-Z:/ for windows only */
if (
(i >= 3 && path[i-1] == '.' && path[i-2] == '.' && IS_SLASH(path[i-3])) /* /../ */
|| (i >= 2 && path[i-1] == '.' && IS_SLASH(path[i-2])) /* /./ */
|| (i == 2 && path[i-1] == '.' && path[i-2] == '.' ) /* ^../ */
|| (i == 1 && path[i-1] == '.') /* ^./ */
#ifdef PHP_WIN32
|| (i == 2 && path[i-1] == ':') /* ^A-Z:/ */
|| (i >= 2 && path[i-1] == '.' && path[i-2] == '.' ) /* ../ */
#endif /* PHP_WIN32 */
) {
path_begin = path + i + 1;
break;
}
Expand Down
151 changes: 151 additions & 0 deletions ext/zip/tests/bug77978_unix.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
--TEST--
Bug #77978 Wrong relative path for :/ unix tests
--SKIPIF--
<?php
if (!extension_loaded('zip')) die('skip');
if (substr(PHP_OS, 0, 3) == 'WIN') die('Skip Unix tests on Windows');
?>
--FILE--
<?php

$file = __DIR__ . DIRECTORY_SEPARATOR . 'bug77978_unix.zip';
$target = __DIR__ . DIRECTORY_SEPARATOR . 'bug77978_unix';
@mkdir($target);

$pathList = [
"dir/test:/filename1.txt",
"dir/test:a/filename2.txt",
"dir./test/filename3.txt",
"dir../test/filename4.txt",
"dir/test/filename5.txt",
"../abc/filename6.txt",
"./abc/filename7.txt",
"/abc/filename8.txt",
"abc/filename9.txt",
":abc/filename10.txt",
"ab:c/filename11.txt",
"abc:/filename12.txt",
"abc/.filename13.txt",
"abc/..filename14.txt",
"abc/../filename15.txt",
"abc/../../filename16.txt",
"abc/../../dir/filename17.txt",
"abc/./filename18.txt",
"abc/file:name19.txt",
"abc/file.name20.txt",
"abc//filename21.txt",
"C:abc/filename22.txt",
"C:\abc/filename23.txt",
"C:/abc/filename24.txt",
];

$zipWriter = new ZipArchive();
$zipWriter->open($file, ZIPARCHIVE::CREATE);
foreach($pathList as $path) {
$zipWriter->addFromString($path, "contents");
}
$zipWriter->close();

$zipReader = new ZipArchive();

$i = 0;
while($zipReader->open($file) !== true && $i < 30) {
++$i;
if($i == 30) {
die("Can't open zip file {$file} for read.");
}
sleep(1);
}

foreach($pathList as $path) {
$zipReader->extractTo($target, $path);
$result = file_exists($target . DIRECTORY_SEPARATOR . $path) ? 'found' : 'not found';
printf("%s \t%s%s", $path, $result, PHP_EOL);
}
$zipReader->close();

unlink($file);

$pathListAdditional = [
"abc/filename6.txt",
"filename16.txt",
"dir/filename17.txt",
];

foreach($pathListAdditional as $path) {
$file = $target . DIRECTORY_SEPARATOR . $path;
$result = file_exists($file) ? 'found' : 'not found';
printf("%s \t%s%s", $path, $result, PHP_EOL);
}

?>
--CLEAN--
<?php
$file = __DIR__ . DIRECTORY_SEPARATOR . 'bug77978_unix.zip';
$target = __DIR__ . DIRECTORY_SEPARATOR . 'bug77978_unix';
unlink($file);

$pathList = [
"dir/test:/filename1.txt",
"dir/test:a/filename2.txt",
"dir./test/filename3.txt",
"dir../test/filename4.txt",
"dir/test/filename5.txt",
"../abc/filename6.txt",
"./abc/filename7.txt",
"/abc/filename8.txt",
"abc/filename9.txt",
":abc/filename10.txt",
"ab:c/filename11.txt",
"abc:/filename12.txt",
"abc/.filename13.txt",
"abc/..filename14.txt",
"abc/../filename15.txt",
"abc/../../filename16.txt",
"abc/../../dir/filename17.txt",
"abc/./filename18.txt",
"abc/file:name19.txt",
"abc/file.name20.txt",
"abc//filename21.txt",
"C:abc/filename22.txt",
"C:\abc/filename23.txt",
"C:/abc/filename24.txt",
"abc/filename6.txt",
"filename16.txt",
"dir/filename17.txt",
];
foreach($pathList as $path) {
if(file_exists($target . DIRECTORY_SEPARATOR . $path)) {
unlink($target . DIRECTORY_SEPARATOR . $path);
}
}
rmdir($target);
?>
--EXPECT--
dir/test:/filename1.txt found
dir/test:a/filename2.txt found
dir./test/filename3.txt found
dir../test/filename4.txt found
dir/test/filename5.txt found
../abc/filename6.txt not found
./abc/filename7.txt found
/abc/filename8.txt found
abc/filename9.txt found
:abc/filename10.txt found
ab:c/filename11.txt found
abc:/filename12.txt found
abc/.filename13.txt found
abc/..filename14.txt found
abc/../filename15.txt found
abc/../../filename16.txt not found
abc/../../dir/filename17.txt not found
abc/./filename18.txt found
abc/file:name19.txt found
abc/file.name20.txt found
abc//filename21.txt found
C:abc/filename22.txt found
C:\abc/filename23.txt found
C:/abc/filename24.txt found
abc/filename6.txt found
filename16.txt found
dir/filename17.txt found
158 changes: 158 additions & 0 deletions ext/zip/tests/bug77978_windows.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
--TEST--
Bug #77978 Wrong relative path for :/ windows tests
--SKIPIF--
<?php
if (!extension_loaded('zip')) die('skip');
if (substr(PHP_OS, 0, 3) != 'WIN') die('Skip Windows tests on Unix systems');
?>
--FILE--
<?php

$file = __DIR__ . DIRECTORY_SEPARATOR . 'bug77978_windows.zip';
$target = __DIR__ . DIRECTORY_SEPARATOR . 'bug77978_windows';
@mkdir($target);

$pathList = [
"abc/test:/filename1.txt",
"abc/test:a/filename2.txt",
"abc./test/filename3.txt",
"abc../test/filename4.txt",
"abc/test/filename5.txt",
"../abc/filename6.txt",
"./abc/filename7.txt",
"/abc/filename8.txt",
"abc/filename9.txt",
":abc/filename10.txt",
"ab:c/filename11.txt",
"abc:/filename12.txt",
"abc/.filename13.txt",
"abc/..filename14.txt",
"abc/../filename15.txt",
"abc/../../filename16.txt",
"abc/../../dir/filename17.txt",
"abc/./filename18.txt",
"abc/file.name19.txt",
"abc//filename20.txt",
"C:abc/filename21.txt",
"C:\abc/filename22.txt",
"C:/abc/filename23.txt",
];

$zipWriter = new ZipArchive();
$zipWriter->open($file, ZIPARCHIVE::CREATE);
foreach($pathList as $path) {
$zipWriter->addFromString($path, "contents");
}
$zipWriter->close();

$zipReader = new ZipArchive();

$i = 0;
while($zipReader->open($file) !== true && $i < 30) {
++$i;
if($i == 30) {
die("Can't open zip file {$file} for read.");
}
sleep(1);
}

foreach($pathList as $path) {
$zipReader->extractTo($target, $path);
$result = file_exists($target . DIRECTORY_SEPARATOR . $path) ? 'found' : 'not found';
printf("%s \t%s%s", $path, $result, PHP_EOL);
}
$zipReader->close();

unlink($file);

$pathListAdditional = [
"test/filename4.txt",
"abc/filename6.txt",
"filename16.txt",
"dir/filename17.txt",
"abc/filename22.txt",
"abc/filename23.txt",
];

foreach($pathListAdditional as $path) {
$file = $target . DIRECTORY_SEPARATOR . $path;
$result = file_exists($file) ? 'found' : 'not found';
printf("%s \t%s%s", $path, $result, PHP_EOL);
}

?>
--CLEAN--
<?php
$file = __DIR__ . DIRECTORY_SEPARATOR . 'bug77978_windows.zip';
$target = __DIR__ . DIRECTORY_SEPARATOR . 'bug77978_windows';
unlink($file);

$pathList = [
"abc./test/filename3.txt",
"test/filename4.txt",
"abc/test/filename5.txt",
"../abc/filename6.txt",
"./abc/filename7.txt",
"/abc/filename8.txt",
"abc/filename9.txt",
":abc/filename10.txt",
"abc/.filename13.txt",
"abc/..filename14.txt",
"abc/../filename15.txt",
"filename16.txt",
"dir/filename17.txt",
"abc/./filename18.txt",
"abc/file.name19.txt",
"abc//filename20.txt",
"abc/filename21.txt",
"abc/filename22.txt",
"abc/filename23.txt",
"abc/filename6.txt",
"filename16.txt",
"abc/filename17.txt",
];
foreach($pathList as $path) {
if(file_exists($target . DIRECTORY_SEPARATOR . $path)) {
unlink($target . DIRECTORY_SEPARATOR . $path);
}
}
rmdir($target);
--EXPECTF--
Warning: ZipArchive::extractTo(): No such file or directory in %s on line %d
abc/test:/filename1.txt not found

Warning: ZipArchive::extractTo(): Not a directory in %s on line %d
abc/test:a/filename2.txt not found
abc./test/filename3.txt found
abc../test/filename4.txt not found
abc/test/filename5.txt found
../abc/filename6.txt not found
./abc/filename7.txt found
/abc/filename8.txt found
abc/filename9.txt found

Warning: ZipArchive::extractTo(): No such file or directory in %s on line %d
:abc/filename10.txt not found

Warning: ZipArchive::extractTo(): Not a directory in %s on line %d
ab:c/filename11.txt not found

Warning: ZipArchive::extractTo(): No such file or directory in %s on line %d
abc:/filename12.txt not found
abc/.filename13.txt found
abc/..filename14.txt found
abc/../filename15.txt found
abc/../../filename16.txt not found
abc/../../dir/filename17.txt not found
abc/./filename18.txt found
abc/file.name19.txt found
abc//filename20.txt found
C:abc/filename21.txt not found
C:\abc/filename22.txt not found
C:/abc/filename23.txt not found
test/filename4.txt found
abc/filename6.txt found
filename16.txt found
dir/filename17.txt found
abc/filename22.txt found
abc/filename23.txt found