Merge pull request #106869 from bruvzg/unzip_64pos

Repiteo · Repiteo · commit a8ecd01e7859 · 2025-05-27T09:39:36.000-05:00
Fix `unzSeekCurrentFile` not resetting `total_out_64`.
diff --git a/thirdparty/minizip/patches/0001-godot-seek.patch b/thirdparty/minizip/patches/0001-godot-seek.patch
@@ -127,7 +127,7 @@ index ea05b7d62a..7e8a6ac2d3 100644
  
      s->pfile_in_zip_read = pfile_in_zip_read_info;
                  s->encrypted = 0;
-@@ -1510,6 +1530,82 @@ extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int* method,
+@@ -1510,6 +1530,84 @@ extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int* method,
      return UNZ_OK;
  }
  
@@ -159,6 +159,7 @@ index ea05b7d62a..7e8a6ac2d3 100644
 +
 +        pfile_in_zip_read_info->stream.avail_in = (uInt)0;
 +        pfile_in_zip_read_info->stream.total_out = pos;
++        pfile_in_zip_read_info->total_out_64 = pos;
 +
 +        return ZSEEK64(pfile_in_zip_read_info->z_filefunc,
 +                       pfile_in_zip_read_info->filestream,
@@ -182,6 +183,7 @@ index ea05b7d62a..7e8a6ac2d3 100644
 +
 +            pfile_in_zip_read_info->stream.avail_in = (uInt)0;
 +            pfile_in_zip_read_info->stream.total_out = 0;
++            pfile_in_zip_read_info->total_out_64 = 0;
 +            pfile_in_zip_read_info->stream.next_in = 0;
 +        }
 +
diff --git a/thirdparty/minizip/unzip.c b/thirdparty/minizip/unzip.c
@@ -1558,6 +1558,7 @@ extern int ZEXPORT unzSeekCurrentFile(unzFile file, int pos) {
 
         pfile_in_zip_read_info->stream.avail_in = (uInt)0;
         pfile_in_zip_read_info->stream.total_out = pos;
+        pfile_in_zip_read_info->total_out_64 = pos;
 
         return ZSEEK64(pfile_in_zip_read_info->z_filefunc,
                        pfile_in_zip_read_info->filestream,
@@ -1581,6 +1582,7 @@ extern int ZEXPORT unzSeekCurrentFile(unzFile file, int pos) {
 
             pfile_in_zip_read_info->stream.avail_in = (uInt)0;
             pfile_in_zip_read_info->stream.total_out = 0;
+            pfile_in_zip_read_info->total_out_64 = 0;
             pfile_in_zip_read_info->stream.next_in = 0;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ index ea05b7d62a..7e8a6ac2d3 100644`
`127`	`127`
`128`	`128`	`s->pfile_in_zip_read = pfile_in_zip_read_info;`
`129`	`129`	`s->encrypted = 0;`
`130`		`-@@ -1510,6 +1530,82 @@ extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int* method,`
	`130`	`+@@ -1510,6 +1530,84 @@ extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int* method,`
`131`	`131`	`return UNZ_OK;`
`132`	`132`	`}`
`133`	`133`
`@@ -159,6 +159,7 @@ index ea05b7d62a..7e8a6ac2d3 100644`
`159`	`159`	`+`
`160`	`160`	`+ pfile_in_zip_read_info->stream.avail_in = (uInt)0;`
`161`	`161`	`+ pfile_in_zip_read_info->stream.total_out = pos;`
	`162`	`++ pfile_in_zip_read_info->total_out_64 = pos;`
`162`	`163`	`+`
`163`	`164`	`+ return ZSEEK64(pfile_in_zip_read_info->z_filefunc,`
`164`	`165`	`+ pfile_in_zip_read_info->filestream,`
`@@ -182,6 +183,7 @@ index ea05b7d62a..7e8a6ac2d3 100644`
`182`	`183`	`+`
`183`	`184`	`+ pfile_in_zip_read_info->stream.avail_in = (uInt)0;`
`184`	`185`	`+ pfile_in_zip_read_info->stream.total_out = 0;`
	`186`	`++ pfile_in_zip_read_info->total_out_64 = 0;`
`185`	`187`	`+ pfile_in_zip_read_info->stream.next_in = 0;`
`186`	`188`	`+ }`
`187`	`189`	`+`