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

Fix zip file opening twice

Browse source 
(cherry picked from commit f403e62df1)
This commit is contained in:
Zae 2021-05-14 13:53:43 +08:00 committed by Rémi Verschelde
parent a00ef0d27b
commit 3fd1a5d144
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
core/io/file_access_zip.cpp
View file

@ -43,14 +43,14 @@ static void *godot_open(void *data, const char *p_fname, int mode) {
return nullptr; return nullptr;
} }
FileAccess *f = (FileAccess *)data; FileAccess *f = FileAccess::open(p_fname, FileAccess::READ);
f->open(p_fname, FileAccess::READ); ERR_FAIL_COND_V(!f, nullptr);
return f->is_open() ? data : nullptr; return f;
} }
static uLong godot_read(void *data, void *fdata, void *buf, uLong size) { static uLong godot_read(void *data, void *fdata, void *buf, uLong size) {
FileAccess *f = (FileAccess *)data; FileAccess *f = (FileAccess *)fdata;
f->get_buffer((uint8_t *)buf, size); f->get_buffer((uint8_t *)buf, size);
return size; return size;
} }
@ -60,12 +60,12 @@ static uLong godot_write(voidpf opaque, voidpf stream, const void *buf, uLong si
} }
static long godot_tell(voidpf opaque, voidpf stream) { static long godot_tell(voidpf opaque, voidpf stream) {
FileAccess *f = (FileAccess *)opaque; FileAccess *f = (FileAccess *)stream;
return f->get_position(); return f->get_position();
} }
static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) { static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
FileAccess *f = (FileAccess *)opaque; FileAccess *f = (FileAccess *)stream;
int pos = offset; int pos = offset;
switch (origin) { switch (origin) {
@ -84,13 +84,17 @@ static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
} }
static int godot_close(voidpf opaque, voidpf stream) { static int godot_close(voidpf opaque, voidpf stream) {
FileAccess *f = (FileAccess *)opaque; FileAccess *f = (FileAccess *)stream;
f->close(); if (f) {
f->close();
memdelete(f);
f = nullptr;
}
return 0; return 0;
} }
static int godot_testerror(voidpf opaque, voidpf stream) { static int godot_testerror(voidpf opaque, voidpf stream) {
FileAccess *f = (FileAccess *)opaque; FileAccess *f = (FileAccess *)stream;
return f->get_error() != OK ? 1 : 0; return f->get_error() != OK ? 1 : 0;
} }
@ -106,23 +110,18 @@ static void godot_free(voidpf opaque, voidpf address) {
void ZipArchive::close_handle(unzFile p_file) const { void ZipArchive::close_handle(unzFile p_file) const {
ERR_FAIL_COND_MSG(!p_file, "Cannot close a file if none is open."); ERR_FAIL_COND_MSG(!p_file, "Cannot close a file if none is open.");
FileAccess *f = (FileAccess *)unzGetOpaque(p_file);
unzCloseCurrentFile(p_file); unzCloseCurrentFile(p_file);
unzClose(p_file); unzClose(p_file);
memdelete(f);
} }
unzFile ZipArchive::get_file_handle(String p_file) const { unzFile ZipArchive::get_file_handle(String p_file) const {
ERR_FAIL_COND_V_MSG(!file_exists(p_file), nullptr, "File '" + p_file + " doesn't exist."); ERR_FAIL_COND_V_MSG(!file_exists(p_file), nullptr, "File '" + p_file + " doesn't exist.");
File file = files[p_file]; File file = files[p_file];
FileAccess *f = FileAccess::open(packages[file.package].filename, FileAccess::READ);
ERR_FAIL_COND_V_MSG(!f, nullptr, "Cannot open file '" + packages[file.package].filename + "'.");
zlib_filefunc_def io; zlib_filefunc_def io;
memset(&io, 0, sizeof(io)); memset(&io, 0, sizeof(io));
io.opaque = f; io.opaque = nullptr;
io.zopen_file = godot_open; io.zopen_file = godot_open;
io.zread_file = godot_read; io.zread_file = godot_read;
io.zwrite_file = godot_write; io.zwrite_file = godot_write;
@ -136,7 +135,7 @@ unzFile ZipArchive::get_file_handle(String p_file) const {
io.free_mem = godot_free; io.free_mem = godot_free;
unzFile pkg = unzOpen2(packages[file.package].filename.utf8().get_data(), &io); unzFile pkg = unzOpen2(packages[file.package].filename.utf8().get_data(), &io);
ERR_FAIL_COND_V(!pkg, nullptr); ERR_FAIL_COND_V_MSG(!pkg, nullptr, "Cannot open file '" + packages[file.package].filename + "'.");
int unz_err = unzGoToFilePos(pkg, &file.file_pos); int unz_err = unzGoToFilePos(pkg, &file.file_pos);
if (unz_err != UNZ_OK || unzOpenCurrentFile(pkg) != UNZ_OK) { if (unz_err != UNZ_OK || unzOpenCurrentFile(pkg) != UNZ_OK) {
unzClose(pkg); unzClose(pkg);
@ -156,12 +155,9 @@ bool ZipArchive::try_open_pack(const String &p_path, bool p_replace_files, size_
} }
zlib_filefunc_def io; zlib_filefunc_def io;
memset(&io, 0, sizeof(io));
FileAccess *fa = FileAccess::open(p_path, FileAccess::READ); io.opaque = nullptr;
if (!fa) {
return false;
}
io.opaque = fa;
io.zopen_file = godot_open; io.zopen_file = godot_open;
io.zread_file = godot_read; io.zread_file = godot_read;
io.zwrite_file = godot_write; io.zwrite_file = godot_write;