Bug #69477 ext/zip: Fix handling of file names with colon sign

If the colon sign is used in a drive relative path (such as
C:temp/file.txt), only the part following the colon should be used as
the filename.

Author: mudrd8mz

ext/zip/php_zip.c

@@ -102,26 +102,31 @@ static char * php_zip_make_relative_path(char *path, size_t path_len) /* {{{ */
 		return NULL;
 	}
 
-	if (path_len == 1 && (path[0] == '.' || IS_SLASH(path[0]))) {
+	if (path_len == 1 && (path[0] == '.' || IS_SLASH(path[0]) || path[0] == ':')) {
 		return NULL;
 	}
 
 	i = path_len;
 
 	while (1) {
-		while (i > 0 && !IS_SLASH(path[i])) {
+		while (i > 0 && !(IS_SLASH(path[i]) || path[i] == ':')) {
 			i--;
 		}
 
 		if (!i) {
-			if (IS_SLASH(path[0])) {
+			if (IS_SLASH(path[0]) || path[0] == ':') {
 				path_begin = path + 1;
 			} else {
 				path_begin = path;
 			}
 			break;
 		}
 
+		if (i == 1 && path[i] == ':') {
+			path_begin = path + i + 1;
+			break;
+		}
+
 		if (i >= 1 && path[i - 1] == ':') {
 			path_begin = path + i + 1;
 			break;

ext/zip/tests/bug69477.phpt

@@ -35,6 +35,7 @@ if (PHP_OS_FAMILY === 'Windows') {
         '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_',
+        'C:a./b./file15.txt' => 'a_/b_/file15.txt',
     ];
 } else {
     $paths = [
@@ -52,6 +53,7 @@ if (PHP_OS_FAMILY === 'Windows') {
         '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.',
+        'C:a./b./file15.txt' => 'a./b./file15.txt',
     ];
 }