OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: FxVMFunctionCall::GetDirectFunction did not perform any checks on the function's self pointer and failed to report a mismatch as an error.

Browse source 
- also fixed two places in the code where the above caused some incorrect definitions not to be detected.
This commit is contained in:
Christoph Oelckers 2017-04-06 20:52:03 +02:00
commit 74faacd218
5 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/scripting/backend/codegen.h
View file

@ -324,7 +324,7 @@ public:
virtual bool isConstant() const;
virtual bool RequestAddress(FCompileContext &ctx, bool *writable);
virtual PPrototype *ReturnProto();
virtual VMFunction *GetDirectFunction(const VersionInfo &ver);
virtual VMFunction *GetDirectFunction(PFunction *func, const VersionInfo &ver);
virtual bool CheckReturn() { return false; }
virtual int GetBitValue() { return -1; }
bool IsNumeric() const { return ValueType->isNumeric(); }
@ -1721,7 +1721,7 @@ public:
~FxVMFunctionCall();
FxExpression *Resolve(FCompileContext&);
PPrototype *ReturnProto();
VMFunction *GetDirectFunction(const VersionInfo &ver);
VMFunction *GetDirectFunction(PFunction *func, const VersionInfo &ver);
ExpEmit Emit(VMFunctionBuilder *build);
bool CheckEmitCast(VMFunctionBuilder *build, bool returnit, ExpEmit &reg);
TArray<PType*> &GetReturnTypes() const
@ -1746,7 +1746,7 @@ public:
FxExpression *Resolve(FCompileContext&);
ExpEmit Emit(VMFunctionBuilder *build);
void Add(FxExpression *expr) { if (expr != NULL) Expressions.Push(expr); expr->NeedResult = false; }
VMFunction *GetDirectFunction(const VersionInfo &ver);
VMFunction *GetDirectFunction(PFunction *func, const VersionInfo &ver);
bool CheckReturn();
};
@ -1953,7 +1953,7 @@ public:
~FxReturnStatement();
FxExpression *Resolve(FCompileContext&);
ExpEmit Emit(VMFunctionBuilder *build);
VMFunction *GetDirectFunction(const VersionInfo &ver);
VMFunction *GetDirectFunction(PFunction *func, const VersionInfo &ver);
bool CheckReturn() { return true; }
};