mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-08 04:38:35 +00:00
Code Issues Projects Releases Wiki Activity

CrashDump: fixed encodedData being uninitialized before getEncodedData() is called

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-11-22 22:31:07 +00:00
parent c37c261c0f
commit 020cd7b966
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/crash/CrashDump.php
View File

@ -64,6 +64,7 @@ use const JSON_UNESCAPED_SLASHES;
use const PHP_OS; use const PHP_OS;
use const PHP_VERSION; use const PHP_VERSION;
use const SORT_STRING; use const SORT_STRING;
use const ZLIB_ENCODING_DEFLATE;
class CrashDump{ class CrashDump{
@ -102,6 +103,14 @@ class CrashDump{
$this->pluginsData(); $this->pluginsData();
$this->extraData(); $this->extraData();
$json = json_encode($this->data, JSON_UNESCAPED_SLASHES);
if($json === false){
throw new \RuntimeException("Failed to encode crashdump JSON: " . json_last_error_msg());
}
$zlibEncoded = zlib_encode($json, ZLIB_ENCODING_DEFLATE, 9);
if($zlibEncoded === false) throw new AssumptionFailedError("ZLIB compression failed");
$this->encodedData = $zlibEncoded;
} }
public function getEncodedData() : string{ public function getEncodedData() : string{
@ -117,13 +126,6 @@ class CrashDump{
$renderer->addLine("----------------------REPORT THE DATA BELOW THIS LINE-----------------------"); $renderer->addLine("----------------------REPORT THE DATA BELOW THIS LINE-----------------------");
$renderer->addLine(); $renderer->addLine();
$renderer->addLine("===BEGIN CRASH DUMP==="); $renderer->addLine("===BEGIN CRASH DUMP===");
$json = json_encode($this->data, JSON_UNESCAPED_SLASHES);
if($json === false){
throw new \RuntimeException("Failed to encode crashdump JSON: " . json_last_error_msg());
}
$zlibEncoded = zlib_encode($json, ZLIB_ENCODING_DEFLATE, 9);
if($zlibEncoded === false) throw new AssumptionFailedError("ZLIB compression failed");
$this->encodedData = $zlibEncoded;
foreach(str_split(base64_encode($this->encodedData), 76) as $line){ foreach(str_split(base64_encode($this->encodedData), 76) as $line){
$renderer->addLine($line); $renderer->addLine($line);
} }