Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-12-13 16:45:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove locks on safe zip file operations (that don't involve the file pointer)

Browse Source
This commit is contained in:
Henrik Rydgård 2024-11-30 11:55:36 +01:00
parent eccf23cf3b
commit 36d10b89e2
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common/File/VFS/ZipFileReader.cpp
View File

@ -229,8 +229,7 @@ public:
};
VFSFileReference *ZipFileReader::GetFile(const char *path) {
std::lock_guard<std::mutex> guard(lock_);
int zi = zip_name_locate(zip_file_, path, ZIP_FL_NOCASE);
int zi = zip_name_locate(zip_file_, path, ZIP_FL_NOCASE); // this is EXPENSIVE
if (zi < 0) {
// Not found.
return nullptr;
@ -244,7 +243,6 @@ bool ZipFileReader::GetFileInfo(VFSFileReference *vfsReference, File::FileInfo *
ZipFileReaderFileReference *reference = (ZipFileReaderFileReference *)vfsReference;
// If you crash here, you called this while having the lock held by having the file open.
// Don't do that, check the info before you open the file.
std::lock_guard<std::mutex> guard(lock_);
zip_stat_t zstat;
if (zip_stat_index(zip_file_, reference->zi, 0, &zstat) != 0)
return false;