zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-05-31 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix missing type check when using Push or Insert for typed arrays

Browse source
This commit is contained in:
Magnus Norddahl 2018-11-14 10:08:04 +01:00 • committed by drfrag666
parent f9fff8bbce
commit 7567462328
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/scripting/backend/codegen.cpp
View file

@ -8248,7 +8248,9 @@ FxExpression *FxMemberFunctionCall::Resolve(FCompileContext& ctx)
{
auto elementType = static_cast<PDynArray*>(Self->ValueType)->ElementType;
Self->ValueType = static_cast<PDynArray*>(Self->ValueType)->BackingType;
bool isDynArrayObj = elementType->isObjectPointer();
// this requires some added type checks for the passed types.
int idx = 0;
for (auto &a : ArgList)
{
a = a->Resolve(ctx);
@ -8257,6 +8259,16 @@ FxExpression *FxMemberFunctionCall::Resolve(FCompileContext& ctx)
delete this;
return nullptr;
}
if (isDynArrayObj && ((MethodName == NAME_Push && idx == 0) || (MethodName == NAME_Insert && idx == 1)))
{
// The DynArray_Obj declaration in dynarrays.txt doesn't support generics yet. Check the type here as if it did.
if (!static_cast<PObjectPointer*>(elementType)->PointedClass()->IsAncestorOf(static_cast<PObjectPointer*>(a->ValueType)->PointedClass()))
{
ScriptPosition.Message(MSG_ERROR, "Type mismatch in function argument");
delete this;
return nullptr;
}
}
if (a->IsDynamicArray())
{
// Copy and Move must turn their parameter into a pointer to the backing struct type.
@ -8296,6 +8308,7 @@ FxExpression *FxMemberFunctionCall::Resolve(FCompileContext& ctx)
return nullptr;
}
}
idx++;
}
}
}