imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-02 05:27:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Occasional crash when multiple threads are reading data from a file provider

Browse Source
This commit is contained in:
WerWolv
2023-03-17 11:43:50 +01:00
parent 880568cc60
commit 1f8645fd43
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/builtin/source/content/providers/file_provider.cpp
View File

@@ -71,6 +71,7 @@ namespace hex::plugin::builtin {
if ((offset + size) > this->getActualSize() || buffer == nullptr || size == 0)
return;
std::scoped_lock lock(this->m_writeMutex);
wolv::io::File writeFile(this->m_path, wolv::io::File::Mode::Write);
if (!writeFile.isValid())
return;
@@ -140,7 +141,7 @@ namespace hex::plugin::builtin {
}
size_t FileProvider::getActualSize() const {
return this->m_fileSize;
return this->m_sizeFile.getSize();
}
std::string FileProvider::getName() const {
@@ -203,7 +204,7 @@ namespace hex::plugin::builtin {
}
this->m_fileStats = file.getFileInfo();
this->m_fileSize = file.getSize();
this->m_sizeFile = wolv::io::File(this->m_path, wolv::io::File::Mode::Read);
return true;
}
@@ -213,6 +214,8 @@ namespace hex::plugin::builtin {
}
wolv::io::File& FileProvider::getFile() {
std::scoped_lock lock(this->m_fileAccessMutex);
if (this->m_files.size() > 5)
this->m_files.clear();
@@ -229,7 +232,7 @@ namespace hex::plugin::builtin {
std::fs::path path = std::u8string(pathString.begin(), pathString.end());
if (auto projectPath = ProjectFile::getPath(); !projectPath.empty())
this->setPath(std::filesystem::weakly_canonical(projectPath.parent_path() / path));
this->setPath(std::fs::weakly_canonical(projectPath.parent_path() / path));
else
this->setPath(path);
}