asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #90404 from aaronp64/zipreader_empty_error

Browse source 
Fix `ZIPReader.get_files()` error on empty zip files
This commit is contained in:
Rémi Verschelde 2024-04-08 23:04:35 +02:00
commit 3d382c16ab
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/zip/zip_reader.cpp
View file

@ -58,7 +58,14 @@ Error ZIPReader::close() {
PackedStringArray ZIPReader::get_files() { PackedStringArray ZIPReader::get_files() {
ERR_FAIL_COND_V_MSG(fa.is_null(), PackedStringArray(), "ZIPReader must be opened before use."); ERR_FAIL_COND_V_MSG(fa.is_null(), PackedStringArray(), "ZIPReader must be opened before use.");
int err = unzGoToFirstFile(uzf); unz_global_info gi;
int err = unzGetGlobalInfo(uzf, &gi);
ERR_FAIL_COND_V(err != UNZ_OK, PackedStringArray());
if (gi.number_entry == 0) {
return PackedStringArray();
}
err = unzGoToFirstFile(uzf);
ERR_FAIL_COND_V(err != UNZ_OK, PackedStringArray()); ERR_FAIL_COND_V(err != UNZ_OK, PackedStringArray());
List<String> s; List<String> s;