Buh #69477 ext/zip: Allow extracting to paths with dirs ending with dot

The function `php_zip_make_relative_path()` used to stop on the first
right-most occurrence of './' in the ZIP entry path. As a result, the
`extractTo()` method didn't extract entries like `foo/bar./baz/file.txt`
into correct location.

Author: mudrd8mz

ext/zip/php_zip.c

@@ -117,11 +117,21 @@ 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 / */
+		if (i >= 1 && path[i - 1] == ':') {
 			path_begin = path + i + 1;
 			break;
 		}
+
+		if (i == 2 && path[i - 2] == '.' && path[i - 1] == '.') {
+			path_begin = path + 3;
+			break;
+		}
+
+		if (i >= 3 && IS_SLASH(path[i - 3]) && path[i - 2] == '.' && path[i - 1] == '.') {
+			path_begin = path + i + 1;
+			break;
+		}
+
 		i--;
 	}
 

ext/zip/tests/bug69477.phpt

@@ -0,0 +1,68 @@
+--TEST--
+Bug #69477 (ZipArchive::extractTo() truncates path segments ending with dot)
+--SKIPIF--
+<?php
+if(!extension_loaded('zip')) die('skip');
+?>
+--FILE--
+<?php
+include __DIR__ . '/utils.inc';
+$dir = __DIR__ . '/bug69477';
+if (file_exists($dir)) rmdir_rf($dir);
+mkdir($dir);
+$zipfile = $dir . '/abc.zip';
+
+$archive = new ZipArchive();
+
+if (!$archive->open($zipfile, ZipArchive::CREATE)) {
+    exit('failed: unable to create archive');
+}
+
+// (string) Entry path in the ZIP => (string) Expected actual target path
+$paths = [
+    '.a/b/c/file01.txt' => '.a/b/c/file01.txt',
+    'a./b/c/file02.txt' => 'a./b/c/file02.txt',
+    'a/.b/c/file03.txt' => 'a/.b/c/file03.txt',
+    'a/b./c/file04.txt' => 'a/b./c/file04.txt',
+    'a/b../c/file05.txt' => 'a/b../c/file05.txt',
+    'a/b.../c/file06.txt' => 'a/b.../c/file06.txt',
+    'a/..b/c/file07.txt' => 'a/..b/c/file07.txt',
+    'a/...b/c/file08.txt' => 'a/...b/c/file08.txt',
+    'a/../b./c./file09.txt' => 'b./c./file09.txt',
+    '//../b./c./file10.txt' => 'b./c./file10.txt',
+    '/../b./c./file11.txt' => 'b./c./file11.txt',
+    'C:/a./b./file12.txt' => 'a./b./file12.txt',
+    'a/b:/c/file13.txt' => 'c/file13.txt',
+];
+
+foreach ($paths as $zippath => $realpath) {
+    $archive->addFromString($zippath, $zippath . ' => ' . $realpath);
+}
+
+$archive->close();
+
+$archive2 = new ZipArchive();
+
+if (!$archive2->open($zipfile)) {
+    exit('failed: unable to open archive2');
+}
+
+$archive2->extractTo($dir);
+$archive2->close();
+
+foreach ($paths as $zippath => $realpath) {
+    if (!is_readable($dir . '/' . $realpath) || file_get_contents($dir . '/' . $realpath) !== $zippath . ' => ' . $realpath) {
+        exit('failed: ' . $zippath);
+    }
+}
+
+echo 'ok';
+?>
+--CLEAN--
+<?php
+include __DIR__ . '/utils.inc';
+$dir = __DIR__ . '/bug69477';
+rmdir_rf($dir);
+?>
+--EXPECT--
+ok