libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 06:41:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed evaluation of GPL mathematical expressions. The evaluator now checks that, at the end of the evaluation, the stack only contains one value (i.e. the result of the expression).

Browse Source 
svn-id: r41477
This commit is contained in:
Denis Kasak 2009-06-12 11:32:44 +00:00
parent fc22ab5748
commit 02cd93421d
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/draci/gpldisasm.cpp
View File

@ -160,6 +160,10 @@ void handleMathExpression(Common::MemoryReadStream &reader) {
uint16 value;
while (1) {
if (obj == kMathEnd) {
// Check whether the expression was evaluated correctly
// The stack should contain only one value after the evaluation
// i.e. the result of the expression
assert(stk.size() == 1 && "Mathematical expression error");
break;
}
@ -177,6 +181,10 @@ void handleMathExpression(Common::MemoryReadStream &reader) {
value = reader.readUint16LE();
stk.pop();
stk.pop();
// FIXME: Pushing dummy value for now, but should push return value
stk.push(0);
debugC(3, kDraciBytecodeDebugLevel, "\t\t-operator %s",
operators[value-1].c_str());
break;
@ -189,6 +197,8 @@ void handleMathExpression(Common::MemoryReadStream &reader) {
case kMathFunctionCall:
value = reader.readUint16LE();
stk.pop();
// FIXME: Pushing dummy value for now, but should push return value
stk.push(0);