[Scummvm-git-logs] scummvm master -> 845cfd9dc08aa0b79a2ca77ac66c952465d0b701

bluegr noreply at scummvm.org
Mon Nov 17 10:24:11 UTC 2025


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
845cfd9dc0 ILLUSIONS: Handle invalid object IDs in opStartMoveActorToObject


Commit: 845cfd9dc08aa0b79a2ca77ac66c952465d0b701
    https://github.com/scummvm/scummvm/commit/845cfd9dc08aa0b79a2ca77ac66c952465d0b701
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-11-17T12:23:39+02:00

Commit Message:
ILLUSIONS: Handle invalid object IDs in opStartMoveActorToObject

Fixes bug #12717

Changed paths:
    engines/illusions/duckman/scriptopcodes_duckman.cpp


diff --git a/engines/illusions/duckman/scriptopcodes_duckman.cpp b/engines/illusions/duckman/scriptopcodes_duckman.cpp
index c6e45028dcd..7bf146f0f3d 100644
--- a/engines/illusions/duckman/scriptopcodes_duckman.cpp
+++ b/engines/illusions/duckman/scriptopcodes_duckman.cpp
@@ -499,6 +499,10 @@ void ScriptOpcodes_Duckman::opStartMoveActorToObject(ScriptThread *scriptThread,
 	ARG_UINT32(objectId2);
 	ARG_UINT32(sequenceId);
 	Control *control1 = _vm->_dict->getObjectControl(objectId1);
+	if (!control1) {
+		warning("opStartMoveActorToObject: Control1 not found for objectId: %08X", objectId1);
+		return;
+	}
 	Common::Point pos;
 	if (objectId2 == 0x40003) {
 		pos = _vm->_cursor._position;




More information about the Scummvm-git-logs mailing list