zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 13:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added validation of LevelCompatibility.Apply() signature

Browse source
This commit is contained in:
alexey.lysiuk 2019-07-03 13:11:48 +03:00
parent bc88ceea94
commit 73f46089cc
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/maploader/compatibility.cpp
View file

@ -54,6 +54,7 @@
#include "actor.h" #include "actor.h"
#include "p_setup.h" #include "p_setup.h"
#include "maploader/maploader.h" #include "maploader/maploader.h"
#include "types.h"
// MACROS ------------------------------------------------------------------ // MACROS ------------------------------------------------------------------
@ -365,11 +366,21 @@ void MapLoader::SetCompatibilityParams(FName checksum)
if (cls->IsDescendantOf(RUNTIME_CLASS(DLevelCompatibility))) if (cls->IsDescendantOf(RUNTIME_CLASS(DLevelCompatibility)))
{ {
PFunction *const func = dyn_cast<PFunction>(cls->FindSymbol("Apply", false)); PFunction *const func = dyn_cast<PFunction>(cls->FindSymbol("Apply", false));
if (func != nullptr) if (func == nullptr)
{ {
VMValue param[] = { lc, checksum.GetIndex(), &Level->MapName }; Printf("Missing 'Apply' method in class '%s', level compatibility object ignored\n", cls->TypeName.GetChars());
VMCall(func->Variants[0].Implementation, param, 3, nullptr, 0); continue;
} }
auto argTypes = func->Variants[0].Proto->ArgumentTypes;
if (argTypes.Size() != 3 || argTypes[1] != TypeName || argTypes[2] != TypeString)
{
Printf("Wrong signature of 'Apply' method in class '%s', level compatibility object ignored\n", cls->TypeName.GetChars());
continue;
}
VMValue param[] = { lc, checksum.GetIndex(), &Level->MapName };
VMCall(func->Variants[0].Implementation, param, 3, nullptr, 0);
} }
} }
} }