mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-11 05:55:33 +00:00
Code Issues Projects Releases Wiki Activity

InGamePacketHandler: fixed invalid JSON being treated as form close

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-01-21 18:32:58 +00:00
parent 56fe71d939
commit 387c13beff
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/network/mcpe/handler/InGamePacketHandler.php
View File

@ -110,7 +110,6 @@ use function is_infinite;
use function is_nan; use function is_nan;
use function json_decode; use function json_decode;
use function json_encode; use function json_encode;
use function json_last_error_msg;
use function max; use function max;
use function mb_strlen; use function mb_strlen;
use function microtime; use function microtime;
@ -120,6 +119,7 @@ use function strlen;
use function strpos; use function strpos;
use function substr; use function substr;
use function trim; use function trim;
use const JSON_THROW_ON_ERROR;
/** /**
* This handler handles packets related to general gameplay. * This handler handles packets related to general gameplay.
@ -879,14 +879,18 @@ class InGamePacketHandler extends PacketHandler{
} }
$fixed = "[" . implode(",", $newParts) . "]"; $fixed = "[" . implode(",", $newParts) . "]";
if(($ret = json_decode($fixed, $assoc)) === null){ try{
throw new PacketHandlingException("Failed to fix JSON: " . json_last_error_msg() . "(original: $json, modified: $fixed)"); return json_decode($fixed, $assoc, flags: JSON_THROW_ON_ERROR);
}catch(\JsonException $e){
throw PacketHandlingException::wrap($e, "Failed to fix JSON (original: $json, modified: $fixed)");
} }
return $ret;
} }
return json_decode($json, $assoc); try{
return json_decode($json, $assoc, flags: JSON_THROW_ON_ERROR);
}catch(\JsonException $e){
throw PacketHandlingException::wrap($e);
}
} }
public function handleServerSettingsRequest(ServerSettingsRequestPacket $packet) : bool{ public function handleServerSettingsRequest(ServerSettingsRequestPacket $packet) : bool{