[Scummvm-git-logs] scummvm master -> 780cdc05f6823f0f0bc61555c3dae8803734db20

[elasota]

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:
780cdc05f6 MTROPOLIS: Fix crash when running programless Miniscript actions


Commit: 780cdc05f6823f0f0bc61555c3dae8803734db20
    https://github.com/scummvm/scummvm/commit/780cdc05f6823f0f0bc61555c3dae8803734db20
Author: elasota (1137273+elasota at users.noreply.github.com)
Date: 2024-09-01T20:15:34-04:00

Commit Message:
MTROPOLIS: Fix crash when running programless Miniscript actions

Changed paths:
    engines/mtropolis/miniscript.cpp
    engines/mtropolis/miniscript.h


diff --git a/engines/mtropolis/miniscript.cpp b/engines/mtropolis/miniscript.cpp
index 4a61691a5ab..e986718a43b 100644
--- a/engines/mtropolis/miniscript.cpp
+++ b/engines/mtropolis/miniscript.cpp
@@ -1908,7 +1908,7 @@ MiniscriptInstructionOutcome Jump::execute(MiniscriptThread *thread) const {
 } // End of namespace MiniscriptInstructions
 
 MiniscriptThread::MiniscriptThread(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msgProps, const Common::SharedPtr<MiniscriptProgram> &program, const Common::SharedPtr<MiniscriptReferences> &refs, Modifier *modifier)
-	: _runtime(runtime), _msgProps(msgProps), _program(program), _instructions(program->getInstructions()), _refs(refs), _modifier(modifier), _currentInstruction(0), _failed(false) {
+	: _runtime(runtime), _msgProps(msgProps), _program(program), _refs(refs), _modifier(modifier), _currentInstruction(0), _failed(false) {
 }
 
 void MiniscriptThread::error(const Common::String &message) {
@@ -2064,7 +2064,7 @@ CORO_BEGIN_DEFINITION(MiniscriptThread::ResumeThreadCoroutine)
 CORO_END_DEFINITION
 
 MiniscriptInstructionOutcome MiniscriptThread::runNextInstruction() {
-	const MiniscriptInstruction *instr = _instructions[_currentInstruction++];
+	const MiniscriptInstruction *instr = _program->getInstructions()[_currentInstruction++];
 
 	MiniscriptInstructionOutcome outcome = instr->execute(this);
 
diff --git a/engines/mtropolis/miniscript.h b/engines/mtropolis/miniscript.h
index 401f1140555..4b40e6f6e29 100644
--- a/engines/mtropolis/miniscript.h
+++ b/engines/mtropolis/miniscript.h
@@ -466,7 +466,6 @@ private:
 	Common::SharedPtr<MiniscriptReferences> _refs;
 	Common::SharedPtr<MessageProperties> _msgProps;
 
-	const Common::Array<MiniscriptInstruction *> &_instructions;
 	Modifier *_modifier;
 	Runtime *_runtime;
 	Common::Array<MiniscriptStackValue> _stack;