2 files changed, 4 insertions, 0 deletions
diff --git a/src/net/eathena/inventoryrecv.cpp b/src/net/eathena/inventoryrecv.cpp
index cc639e6e3..8bc93208f 100644
--- a/src/net/eathena/inventoryrecv.cpp
+++ b/src/net/eathena/inventoryrecv.cpp
@@ -1154,6 +1154,8 @@ int InventoryRecv::getSlot(const int eAthenaSlot)
         mask <<= 1;
         position++;
     }
+    if (position >= EquipSlot::VECTOREND)
+        return EquipSlot::VECTOREND;
     return CAST_S32(EQUIP_POINTS[position]);
 }
 
diff --git a/src/net/tmwa/inventoryrecv.cpp b/src/net/tmwa/inventoryrecv.cpp
index 30e30502d..6e1fe0cfe 100644
--- a/src/net/tmwa/inventoryrecv.cpp
+++ b/src/net/tmwa/inventoryrecv.cpp
@@ -530,6 +530,8 @@ int InventoryRecv::getSlot(const int eAthenaSlot)
         mask <<= 1;
         position++;
     }
+    if (position >= EquipSlot::VECTOREND)
+        return EquipSlot::VECTOREND;
     return CAST_S32(EQUIP_POINTS[position]);
 }