mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Loïc Guilloux 2023-06-18 12:03:59 +02:00 committed by GitHub
parent 381e8b69d2
commit 1d9bc23525
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/script/script_instance.cpp
View File

@ -694,9 +694,16 @@ void ScriptInstance::LoadOnStack(ScriptData *data)
ScriptDataVariant version = data->front();
data->pop_front();
sq_pushinteger(vm, std::get<SQInteger>(version));
LoadObjects(vm, data);
this->is_save_data_on_stack = true;
SQInteger top = sq_gettop(vm);
try {
sq_pushinteger(vm, std::get<SQInteger>(version));
LoadObjects(vm, data);
this->is_save_data_on_stack = true;
} catch (Script_FatalError &e) {
ScriptLog::Warning(fmt::format("Loading failed: {}", e.GetErrorMessage()));
/* Discard partially loaded savegame data and version. */
sq_settop(vm, top);
}
}
bool ScriptInstance::CallLoad()