mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-03 00:29:54 +00:00
Code Issues Projects Releases Wiki Activity

InventoryManager: verify slot existence in locateWindowAndSlot()

Browse Source 
previously, this would happily return invalid slot IDs, potentially leading to a crash.
This commit is contained in:
Dylan K. Taylor 2023-04-27 13:18:28 +01:00
parent 1d10107024
commit 5a54d09869
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/mcpe/InventoryManager.php
View File

@ -205,11 +205,13 @@ class InventoryManager{
if($entry === null){ if($entry === null){
return null; return null;
} }
$inventory = $entry->getInventory();
$coreSlotId = $entry->mapNetToCore($netSlotId); $coreSlotId = $entry->mapNetToCore($netSlotId);
return $coreSlotId !== null ? [$entry->getInventory(), $coreSlotId] : null; return $coreSlotId !== null && $inventory->slotExists($coreSlotId) ? [$inventory, $coreSlotId] : null;
} }
if(isset($this->networkIdToInventoryMap[$windowId])){ $inventory = $this->networkIdToInventoryMap[$windowId] ?? null;
return [$this->networkIdToInventoryMap[$windowId], $netSlotId]; if($inventory !== null && $inventory->slotExists($netSlotId)){
return [$inventory, $netSlotId];
} }
return null; return null;
} }