mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-14 23:45:34 +00:00
Code Issues Projects Releases Wiki Activity

Fixed stack trace encoding bug in CrashDump

Browse Source 
it was encoding the real (full) trace, instead of emitting the printable version.
This commit is contained in:
Dylan K. Taylor 2019-01-16 18:56:56 +00:00
parent 0f545c410a
commit e9d1af0aee
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/CrashDump.php
View File

@ -44,6 +44,7 @@ use function implode;
use function is_dir; use function is_dir;
use function is_resource; use function is_resource;
use function json_encode; use function json_encode;
use function json_last_error_msg;
use function max; use function max;
use function mkdir; use function mkdir;
use function ob_end_clean; use function ob_end_clean;
@ -146,7 +147,11 @@ class CrashDump{
$this->addLine("----------------------REPORT THE DATA BELOW THIS LINE-----------------------"); $this->addLine("----------------------REPORT THE DATA BELOW THIS LINE-----------------------");
$this->addLine(); $this->addLine();
$this->addLine("===BEGIN CRASH DUMP==="); $this->addLine("===BEGIN CRASH DUMP===");
$this->encodedData = zlib_encode(json_encode($this->data, JSON_UNESCAPED_SLASHES), ZLIB_ENCODING_DEFLATE, 9); $json = json_encode($this->data, JSON_UNESCAPED_SLASHES);
if($json === false){
throw new \RuntimeException("Failed to encode crashdump JSON: " . json_last_error_msg());
}
$this->encodedData = zlib_encode($json, ZLIB_ENCODING_DEFLATE, 9);
foreach(str_split(base64_encode($this->encodedData), 76) as $line){ foreach(str_split(base64_encode($this->encodedData), 76) as $line){
$this->addLine($line); $this->addLine($line);
} }
@ -238,6 +243,9 @@ class CrashDump{
} }
if(isset($lastError)){ if(isset($lastError)){
if(isset($lastError["trace"])){
$lastError["trace"] = Utils::printableTrace($lastError["trace"]);
}
$this->data["lastError"] = $lastError; $this->data["lastError"] = $lastError;
} }