DIRECTOR: Lingo: Fix stack underflow on not enough parameters

scummvm · Aug 3, 2016 · fa7725a · fa7725a
1 parent dc49888
commit fa7725a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
@@ -55,6 +55,13 @@ void Lingo::push(Datum d) {
 	_stack.push_back(d);
 }
 
+void Lingo::pushVoid() {
+	Datum d;
+	d.u.i = 0;
+	d.type = VOID;
+	push(d);
+}
+
 Datum Lingo::pop(void) {
 	if (_stack.size() == 0)
 		error("stack underflow");
@@ -692,10 +699,7 @@ void Lingo::c_call() {
 			g_lingo->pop();
 
 		// Push dummy value
-		Datum d;
-		d.u.i = 0;
-		d.type = VOID;
-		g_lingo->push(d);
+		g_lingo->pushVoid();
 
 		return;
 	}
@@ -714,8 +718,10 @@ void Lingo::c_call() {
 			for (int i = 0; i < nargs; i++)
 				g_lingo->pop();
 
-				return;
-			}
+			g_lingo->pushVoid();
+
+			return;
+		}
 		(*sym->u.func)();
 
 		return;

diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
@@ -189,6 +189,8 @@ class Lingo {
 	int codeFloat(double f);
 	void codeFactory(Common::String &s);
 
+	void pushVoid();
+
 	static void c_xpop();
 	static void c_printtop();