Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #608 from pzychotic/fix-604

Browse Source 
Fixed access of map::iterator to recently deleted element
This commit is contained in:
Azamat H. Hackimov 2024-09-25 23:01:50 +03:00 committed by GitHub
commit 9756e5917d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Descent3/OsirisLoadandBind.cpp
View File

@ -918,7 +918,7 @@ int get_full_path_to_module(const std::filesystem::path &module_name, std::files
return -2;
// search through our list of extracted files to find it...
if (OSIRIS_Extracted_scripts.find(std::filesystem::path(basename)) != OSIRIS_Extracted_scripts.end()) {
if (OSIRIS_Extracted_scripts.find(basename) != OSIRIS_Extracted_scripts.end()) {
fullpath = OSIRIS_Extracted_script_dir / OSIRIS_Extracted_scripts[basename].temp_filename;
return 0;
}
@ -3200,12 +3200,14 @@ void Osiris_ClearExtractedScripts(bool mission_only) {
return;
}
for (auto it = OSIRIS_Extracted_scripts.begin(); it != OSIRIS_Extracted_scripts.end(); ++it) {
if (mission_only && (!(it->second.flags & OESF_MISSION)))
continue;
std::filesystem::remove(OSIRIS_Extracted_script_dir / it->second.temp_filename);
OSIRIS_Extracted_scripts.erase(it);
for (auto it = OSIRIS_Extracted_scripts.begin(); it != OSIRIS_Extracted_scripts.end();) {
if (mission_only && (!(it->second.flags & OESF_MISSION))) {
++it;
}
else {
std::filesystem::remove(OSIRIS_Extracted_script_dir / it->second.temp_filename);
it = OSIRIS_Extracted_scripts.erase(it);
}
}
if (!mission_only) {