[Scummvm-git-logs] scummvm master -> b511300bf600f3aacee57c2770cf94c8a80cac7d
djsrv
dservilla at gmail.com
Sun Jun 28 03:08:13 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b511300bf6 DIRECTOR: LINGO: Fix cb_objectcall pointer issues
Commit: b511300bf600f3aacee57c2770cf94c8a80cac7d
https://github.com/scummvm/scummvm/commit/b511300bf600f3aacee57c2770cf94c8a80cac7d
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-27T23:07:57-04:00
Commit Message:
DIRECTOR: LINGO: Fix cb_objectcall pointer issues
Changed paths:
engines/director/lingo/lingo-bytecode.cpp
diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index 9af4a8b702..75ee4584de 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -314,11 +314,12 @@ void LC::cb_objectcall() {
Datum d = g_lingo->pop();
Datum nargs = g_lingo->pop();
- Object *target;
+ Object *target = nullptr;
if (d.type == INT) {
if (g_lingo->_callstack.empty()) {
warning("cb_objectcall: no call frame");
+ return;
}
Common::Array<Common::String> *varNames = g_lingo->_callstack.back()->sp.varNames;
if ((d.asInt() % 6 == 0) && varNames && (d.asInt() / 6 < (int)varNames->size())) {
More information about the Scummvm-git-logs
mailing list