preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix several problems with ZipContainer in Common/File/VFS/ZipFileReader.cpp

Browse Source
This commit is contained in:
刘皓
2026-01-02 14:25:13 -05:00
parent 295ac0e9f6
commit 17acfe31a3
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/File/VFS/ZipFileReader.cpp
+17 -14
View File
@@ -15,26 +15,23 @@
#include "Common/File/VFS/ZipFileReader.h"
#include "Common/StringUtils.h"
ZipContainer::ZipContainer() noexcept : sourceData_ {{}, nullptr}, zip_(nullptr) {}
ZipContainer::ZipContainer() noexcept : sourceData_(nullptr), zip_(nullptr) {}
ZipContainer::ZipContainer(const Path &path) : sourceData_ {path, nullptr}, zip_(nullptr) {
zip_source_t *source = zip_source_function_create(SourceCallback, &sourceData_, nullptr);
ZipContainer::ZipContainer(const Path &path) : sourceData_(new SourceData {path, nullptr}), zip_(nullptr) {
zip_source_t *source = zip_source_function_create(SourceCallback, sourceData_, nullptr);
if ((zip_ = zip_open_from_source(source, ZIP_RDONLY, nullptr)) == nullptr) {
zip_source_free(source);
}
}
ZipContainer::ZipContainer(ZipContainer &&other) noexcept : sourceData_(other.sourceData_), zip_(other.zip_) {
other.sourceData_.path.clear();
other.sourceData_.file = nullptr;
other.zip_ = nullptr;
ZipContainer::ZipContainer(ZipContainer &&other) noexcept {
*this = std::move(other);
}
ZipContainer &ZipContainer::operator=(ZipContainer &&other) noexcept {
sourceData_ = other.sourceData_;
zip_ = other.zip_;
other.sourceData_.path.clear();
other.sourceData_.file = nullptr;
other.sourceData_ = nullptr;
other.zip_ = nullptr;
return *this;
}
@@ -48,6 +45,10 @@ void ZipContainer::close() noexcept {
zip_close(zip_);
zip_ = nullptr;
}
if (sourceData_ != nullptr) {
delete sourceData_;
sourceData_ = nullptr;
}
}
ZipContainer::operator zip_t *() const noexcept {
@@ -79,6 +80,7 @@ zip_int64_t ZipContainer::SourceCallback(void *userdata, void *data, zip_uint64_
sourceData.file = newFile;
return 0;
}
case ZIP_SOURCE_READ:
{
size_t n = fread(data, 1, len, sourceData.file);
@@ -91,10 +93,11 @@ zip_int64_t ZipContainer::SourceCallback(void *userdata, void *data, zip_uint64_
return 0;
case ZIP_SOURCE_STAT:
{
if (sourceData.file == nullptr) {
return -1;
}
if (sourceData.file == nullptr) {
zip_stat_t *stat = (zip_stat_t *)data;
zip_stat_init(stat);
stat->valid = 0;
} else {
int64_t pos = File::Ftell(sourceData.file);
if (pos == -1) {
return -1;
@@ -110,8 +113,8 @@ zip_int64_t ZipContainer::SourceCallback(void *userdata, void *data, zip_uint64_
zip_stat_init(stat);
stat->valid = ZIP_STAT_SIZE;
stat->size = size;
return 0;
}
return 0;
case ZIP_SOURCE_ERROR:
return ZIP_ER_INTERNAL;
Common/File/VFS/ZipFileReader.h
+1 -1
View File
@@ -31,7 +31,7 @@ private:
struct SourceData {
Path path;
FILE *file;
} sourceData_;
} *sourceData_;
zip_t *zip_;
static zip_int64_t SourceCallback(void *userdata, void *data, zip_uint64_t len, zip_source_cmd_t cmd);