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

LoginPacketHandler: account for failure to correctly parse UUID

Browse Source 
this will still crash in some circumstances, pending merging bug fixes from stable.
This commit is contained in:
Dylan K. Taylor 2020-04-16 01:45:00 +01:00
parent d3a6da1b3a
commit 9ba47f90d1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/mcpe/handler/LoginPacketHandler.php
View File

@ -25,6 +25,7 @@ namespace pocketmine\network\mcpe\handler;
use pocketmine\entity\Skin; use pocketmine\entity\Skin;
use pocketmine\event\player\PlayerPreLoginEvent; use pocketmine\event\player\PlayerPreLoginEvent;
use pocketmine\network\BadPacketException;
use pocketmine\network\mcpe\auth\ProcessLoginTask; use pocketmine\network\mcpe\auth\ProcessLoginTask;
use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\NetworkSession;
use pocketmine\network\mcpe\protocol\LoginPacket; use pocketmine\network\mcpe\protocol\LoginPacket;
@ -111,9 +112,14 @@ class LoginPacketHandler extends PacketHandler{
return true; return true;
} }
try{
$uuid = UUID::fromString($packet->extraData->identity);
}catch(\InvalidArgumentException $e){
throw BadPacketException::wrap($e, "Failed to parse login UUID");
}
$this->session->setPlayerInfo(new PlayerInfo( $this->session->setPlayerInfo(new PlayerInfo(
$packet->extraData->displayName, $packet->extraData->displayName,
UUID::fromString($packet->extraData->identity), $uuid,
$skin, $skin,
$packet->clientData->LanguageCode, $packet->clientData->LanguageCode,
$packet->extraData->XUID, $packet->extraData->XUID,