Merge pull request #3320 from Ghabry/issue-3314

ChangeSpriteAssociation: Fix OOB reads
EasyRPG · Jan 4, 2025 · 8038b7b · 8038b7b
2 parents 65478ef + fa5292b
commit 8038b7b
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
@@ -2112,8 +2112,17 @@ bool Game_Interpreter::CommandChangeSpriteAssociation(lcf::rpg::EventCommand con
 	}
 
 	auto file = ToString(CommandStringOrVariableBitfield(com, 3, 1, 4));
-	int idx = ValueOrVariableBitfield(com, 3, 2, 1);
-	bool transparent = com.parameters[2] != 0;
+
+	int idx = 0;
+	if (com.parameters.size() > 1) {
+		idx = ValueOrVariableBitfield(com, 3, 2, 1);
+	}
+
+	bool transparent = false;
+	if (com.parameters.size() > 2) {
+		transparent = com.parameters[2] != 0;
+	}
+
 	actor->SetSprite(file, idx, transparent);
 	Main_Data::game_player->ResetGraphic();
 	return true;