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

PlayerNetworkSessionAdapter: clean up leftovers from multi quote support for json decode

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-02-05 20:45:13 +00:00
parent e1ddf90695
commit 889cd5e206
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php
View File

@ -274,9 +274,9 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
$raw = $matches[1]; $raw = $matches[1];
$lastComma = -1; $lastComma = -1;
$newParts = []; $newParts = [];
$quoteType = null; $inQuotes = false;
for($i = 0, $len = strlen($raw); $i <= $len; ++$i){ for($i = 0, $len = strlen($raw); $i <= $len; ++$i){
if($i === $len or ($raw[$i] === "," and $quoteType === null)){ if($i === $len or ($raw[$i] === "," and !$inQuotes)){
$part = substr($raw, $lastComma + 1, $i - ($lastComma + 1)); $part = substr($raw, $lastComma + 1, $i - ($lastComma + 1));
if(trim($part) === ""){ //regular parts will have quotes or something else that makes them non-empty if(trim($part) === ""){ //regular parts will have quotes or something else that makes them non-empty
$part = '""'; $part = '""';
@ -284,13 +284,13 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
$newParts[] = $part; $newParts[] = $part;
$lastComma = $i; $lastComma = $i;
}elseif($raw[$i] === '"'){ }elseif($raw[$i] === '"'){
if($quoteType === null){ if(!$inQuotes){
$quoteType = $raw[$i]; $inQuotes = true;
}elseif($raw[$i] === $quoteType){ }else{
$backslashes = 0; $backslashes = 0;
for(; $backslashes < $i && $raw[$i - $backslashes - 1] === "\\"; ++$backslashes){} for(; $backslashes < $i && $raw[$i - $backslashes - 1] === "\\"; ++$backslashes){}
if(($backslashes % 2) === 0){ //unescaped quote if(($backslashes % 2) === 0){ //unescaped quote
$quoteType = null; $inQuotes = false;
} }
} }
} }