zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-27 04:00:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Add some extra safety to defineqav parser to ensure some unsupported actions can't be performed.

Browse source
This commit is contained in:
Mitchell Richters 2021-08-23 14:19:33 +10:00
parent 34042f842a
commit e68b793852
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/core/defparser.cpp
View file

@ -2098,6 +2098,11 @@ static bool parseDefineQAVInterpolateBlock(FScanner& sc, const int& res_id, cons
sc.GetString(); sc.GetString();
if (sc.Compare("type")) if (sc.Compare("type"))
{ {
if (interptype.IsNotEmpty())
{
pos.Message(MSG_ERROR, "defineqav (%d): interpolate (%s): more than one interpolation type defined, unable to continue", res_id, interptype.GetChars());
return false;
}
sc.GetString(interptype); sc.GetString(interptype);
if (!gi->IsQAVInterpTypeValid(interptype)) if (!gi->IsQAVInterpTypeValid(interptype))
{ {
@ -2138,6 +2143,11 @@ void parseDefineQAV(FScanner& sc, FScriptPosition& pos)
sc.MustGetString(); sc.MustGetString();
if (sc.Compare("file")) if (sc.Compare("file"))
{ {
if (fn.IsNotEmpty())
{
pos.Message(MSG_ERROR, "defineqav (%d): more than one file defined, unable to continue", res_id);
return;
}
sc.GetString(fn); sc.GetString(fn);
// Test file's validity. // Test file's validity.
@ -2156,6 +2166,11 @@ void parseDefineQAV(FScanner& sc, FScriptPosition& pos)
} }
else if (sc.Compare("interpolate")) else if (sc.Compare("interpolate"))
{ {
if (interpolate)
{
pos.Message(MSG_ERROR, "defineqav (%d): more than one interpolate block defined, unable to continue", res_id);
return;
}
interpolate = true; interpolate = true;
if (!parseDefineQAVInterpolateBlock(sc, res_id, numframes)) return; if (!parseDefineQAVInterpolateBlock(sc, res_id, numframes)) return;
} }