Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Fix problem with ZIPPacker 

The Zipfile Reference should be set to `NULL` when the `ZIPPacker` is closed not when a file in it is closed.

When calling `ZIPPacker.close` without this nothing happens because `zf` is `NULL`. (7zip could still extract the file but warned about unexpected end of file.)
4.0
HolonProduction 2022-11-13 12:50:40 +07:00
parent c17f17eb98
commit ab23736751
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/zip/zip_packer.cpp
Unescape Escape View File

@ -46,7 +46,11 @@ Error ZIPPacker::open(String p_path, ZipAppend p_append) {
Error ZIPPacker::close() {
ERR_FAIL_COND_V_MSG(fa.is_null(), FAILED, "ZIPPacker cannot be closed because it is not open.");
return zipClose(zf, NULL) == ZIP_OK ? OK : FAILED;
Error err = zipClose(zf, NULL) == ZIP_OK ? OK : FAILED;
if (err == OK) {
zf = NULL;
}
return err;
}
Error ZIPPacker::start_file(String p_path) {
@ -79,11 +83,7 @@ Error ZIPPacker::write_file(Vector<uint8_t> p_data) {
Error ZIPPacker::close_file() {
ERR_FAIL_COND_V_MSG(fa.is_null(), FAILED, "ZIPPacker must be opened before use.");
Error err = zipCloseFileInZip(zf) == ZIP_OK ? OK : FAILED;
if (err == OK) {
zf = NULL;
}
return err;
return zipCloseFileInZip(zf) == ZIP_OK ? OK : FAILED;
}
void ZIPPacker::_bind_methods() {