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

CrashDump: fixed failure to generate crash report when error messages contain invalid characters

Browse Source 
closes #2986
This commit is contained in:
Dylan K. Taylor 2022-11-15 22:00:20 +00:00
parent 0c463a8721
commit 6562335120
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/crash/CrashDump.php
View File

@ -43,6 +43,7 @@ use function get_loaded_extensions;
use function json_encode; use function json_encode;
use function ksort; use function ksort;
use function max; use function max;
use function mb_scrub;
use function mb_strtoupper; use function mb_strtoupper;
use function microtime; use function microtime;
use function ob_end_clean; use function ob_end_clean;
@ -196,12 +197,14 @@ class CrashDump{
$error["message"] = substr($error["message"], 0, $pos); $error["message"] = substr($error["message"], 0, $pos);
} }
} }
$error["message"] = mb_scrub($error["message"], 'UTF-8');
if(isset($lastError)){ if(isset($lastError)){
if(isset($lastError["trace"])){ if(isset($lastError["trace"])){
$lastError["trace"] = Utils::printableTrace($lastError["trace"]); $lastError["trace"] = Utils::printableTrace($lastError["trace"]);
} }
$this->data->lastError = $lastError; $this->data->lastError = $lastError;
$this->data->lastError["message"] = mb_scrub($this->data->lastError["message"], 'UTF-8');
} }
$this->data->error = $error; $this->data->error = $error;