games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Fix crash on handling invalid player request

Browse Source
This commit is contained in:
Ivan Savenko
2023-09-19 16:31:06 +03:00
parent 807f308c91
commit 3cdc3daa2c
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/CGameHandler.cpp
View File

@@ -2035,10 +2035,18 @@ bool CGameHandler::bulkSmartSplitStack(SlotID slotSrc, ObjectInstanceID srcOwner
bool CGameHandler::arrangeStacks(ObjectInstanceID id1, ObjectInstanceID id2, ui8 what, SlotID p1, SlotID p2, si32 val, PlayerColor player) bool CGameHandler::arrangeStacks(ObjectInstanceID id1, ObjectInstanceID id2, ui8 what, SlotID p1, SlotID p2, si32 val, PlayerColor player)
{ {
const CArmedInstance * s1 = static_cast<const CArmedInstance *>(getObjInstance(id1)), const CArmedInstance * s1 = static_cast<const CArmedInstance *>(getObjInstance(id1));
* s2 = static_cast<const CArmedInstance *>(getObjInstance(id2)); const CArmedInstance * s2 = static_cast<const CArmedInstance *>(getObjInstance(id2));
const CCreatureSet &S1 = *s1, &S2 = *s2; const CCreatureSet & S1 = *s1;
const CCreatureSet & S2 = *s2;
StackLocation sl1(s1, p1), sl2(s2, p2); StackLocation sl1(s1, p1), sl2(s2, p2);
if (s1 == nullptr || s2 == nullptr)
{
complain("Cannot exchange stacks between non-existing objects!!\n");
return false;
}
if (!sl1.slot.validSlot() || !sl2.slot.validSlot()) if (!sl1.slot.validSlot() || !sl2.slot.validSlot())
{ {
complain(complainInvalidSlot); complain(complainInvalidSlot);