dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #10868: [Script] Handle errors when loading savegame data on stack (#11029)

Browse Source 
(cherry picked from commit 1d9bc23525)
This commit is contained in:
Loïc Guilloux
2023-06-18 12:03:59 +02:00
committed by Jonathan G Rennison
parent cc22351ef4
commit 6c19e5ecae
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/script/script_instance.cpp
View File

@@ -29,6 +29,8 @@
#include "../fileio_func.h" #include "../fileio_func.h"
#include "../league_type.h" #include "../league_type.h"
#include "../3rdparty/fmt/format.h"
#include "../safeguards.h" #include "../safeguards.h"
ScriptStorage::~ScriptStorage() ScriptStorage::~ScriptStorage()
@@ -731,9 +733,16 @@ void ScriptInstance::LoadOnStack(ScriptData *data)
ScriptDataVariant version = data->front(); ScriptDataVariant version = data->front();
data->pop_front(); data->pop_front();
SQInteger top = sq_gettop(vm);
try {
sq_pushinteger(vm, std::get<SQInteger>(version)); sq_pushinteger(vm, std::get<SQInteger>(version));
LoadObjects(vm, data); LoadObjects(vm, data);
this->is_save_data_on_stack = true; this->is_save_data_on_stack = true;
} catch (Script_FatalError &e) {
ScriptLog::Warning(fmt::format("Loading failed: {}", e.GetErrorMessage()).c_str());
/* Discard partially loaded savegame data and version. */
sq_settop(vm, top);
}
} }
bool ScriptInstance::CallLoad() bool ScriptInstance::CallLoad()