Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix unzSeekCurrentFile not resetting total_out_64.

Browse source
This commit is contained in:
Pāvels Nadtočajevs 2025-05-27 16:23:48 +03:00
parent 6c9765d87e
commit f0dcccf11c
No known key found for this signature in database
GPG key ID: 8413210218EF35D2
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
thirdparty/minizip/patches/0001-godot-seek.patch vendored
View file

@ -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;
+ }
+

2
thirdparty/minizip/unzip.c vendored
View file

@ -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;
}