Bug #69477 ext/zip: Do not extract files that can't be opened on Windows

There are known issues with folder and files ending with dot on Windows.
Similarly to how 7-zip deals with the situation, replace the trailing
dot with underscore for such files.

Author: mudrd8mz

ext/zip/php_zip.c

@@ -102,8 +102,8 @@ static char * php_zip_make_relative_path(char *path, size_t path_len) /* {{{ */
 		return NULL;
 	}
 
-	if (IS_SLASH(path[0])) {
-		return path + 1;
+	if (path_len == 1 && (path[0] == '.' || IS_SLASH(path[0]))) {
+		return NULL;
 	}
 
 	i = path_len;
@@ -114,7 +114,12 @@ static char * php_zip_make_relative_path(char *path, size_t path_len) /* {{{ */
 		}
 
 		if (!i) {
-			return path;
+			if (IS_SLASH(path[0])) {
+				path_begin = path + 1;
+			} else {
+				path_begin = path;
+			}
+			break;
 		}
 
 		if (i >= 1 && path[i - 1] == ':') {
@@ -135,6 +140,18 @@ static char * php_zip_make_relative_path(char *path, size_t path_len) /* {{{ */
 		i--;
 	}
 
+#ifdef PHP_WIN32
+	if (path[path_len - 1] == '.') {
+		path[path_len - 1] = '_';
+	}
+
+	for (i = 1; i < path_len; i++) {
+		if (IS_SLASH(path[i]) && path[i - 1] == '.') {
+			 path[i - 1] = '_';
+		}
+	}
+#endif
+
 	return path_begin;
 }
 /* }}} */

ext/zip/tests/bug69477.phpt

@@ -19,21 +19,41 @@ if (!$archive->open($zipfile, ZipArchive::CREATE)) {
 }
 
 // (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',
-];
+if (PHP_OS_FAMILY === 'Windows') {
+    $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',
+        'a/b/c/file14.' => 'a/b/c/file14_',
+    ];
+} else {
+    $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',
+        'a/b/c/file14.' => 'a/b/c/file14.',
+    ];
+}
 
 foreach ($paths as $zippath => $realpath) {
     $archive->addFromString($zippath, $zippath . ' => ' . $realpath);