Fix OOB access when accessing stash

3 years ago · 58b48e17ea
1 changed files with 4 additions and 3 deletions
--- a/Source/qol/stash.cpp
+++ b/Source/qol/stash.cpp
@ -357,10 +357,11 @@ void DrawStash(const Surface &out)

 	for (auto slot : StashGridRange) {
 		StashStruct::StashCell itemId = Stash.GetItemIdAtPosition(slot);
-		Item &item = Stash.stashList[itemId];
-		if (Stash.IsItemAtPosition(slot)) {
-			InvDrawSlotBack(out, GetStashSlotCoord(slot) + offset, InventorySlotSizeInPixels, item._iMagical);
+		if (itemId == StashStruct::EmptyCell) {
+			continue; // No item in the given slot
 		}
+		Item &item = Stash.stashList[itemId];
+		InvDrawSlotBack(out, GetStashSlotCoord(slot) + offset, InventorySlotSizeInPixels, item._iMagical);
 	}

 	for (auto slot : StashGridRange) {