M CHANGES → CHANGES

@@ -25,6 +25,7 @@ - GBA Memory: Fix alignment of LDM/STM on SRAM
  - GBA: Initialize uninitialized pristineRom and pristineRomSize members
  - GBA Memory: Fix unaligned out-of-bounds ROM loads
  - GBA: Fix warnings when creating and loading savestates
+ - Qt: Add additional checks in CheatModel to prevent crashes
 Misc:
  - Qt: Window size command line options are now supported
  - Qt: Increase usability of key mapper

M src/platform/qt/CheatsModel.cpp → src/platform/qt/CheatsModel.cpp

@@ -42,6 +42,10 @@ return QVariant();
 		}
 	}
 
+	if (index.row() >= GBACheatSetsSize(&m_device->cheats)) {
+		return QVariant();
+	}
+
 	int row = index.row();
 	const GBACheatSet* cheats = *GBACheatSetsGetPointer(&m_device->cheats, index.row());
 	switch (role) {
@@ -56,7 +60,7 @@ }
 }
 
 bool CheatsModel::setData(const QModelIndex& index, const QVariant& value, int role) {
-	if (!index.isValid() || index.parent().isValid()) {
+	if (!index.isValid() || index.parent().isValid() || index.row() > GBACheatSetsSize(&m_device->cheats)) {
 		return false;
 	}
 
@@ -139,11 +143,14 @@ }
 	if (index.parent().isValid()) {
 		return static_cast<GBACheatSet*>(index.internalPointer());
 	}
+	if (index.row() >= GBACheatSetsSize(&m_device->cheats)) {
+		return nullptr;
+	}
 	return *GBACheatSetsGetPointer(&m_device->cheats, index.row());
 }
 
 void CheatsModel::removeAt(const QModelIndex& index) {
-	if (!index.isValid() || index.parent().isValid()) {
+	if (!index.isValid() || index.parent().isValid() || index.row() >= GBACheatSetsSize(&m_device->cheats)) {
 		return;
 	}
 	int row = index.row();