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

Utils: fixed getTrace() including itself in trace when no alt trace is given

Browse Source 
it always seemed a little strange that crashdump trace would pop 4 frames when only 3 are written in the comment...
This commit is contained in:
Dylan K. Taylor 2018-12-16 17:13:36 +00:00
parent bf8a8b386e
commit b80868040e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/CrashDump.php
View File

@ -159,7 +159,7 @@ class CrashDump{
$error = $lastExceptionError; $error = $lastExceptionError;
}else{ }else{
$error = (array) error_get_last(); $error = (array) error_get_last();
$error["trace"] = Utils::getTrace(4); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump $error["trace"] = Utils::getTrace(3); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump
$errorConversion = [ $errorConversion = [
E_ERROR => "E_ERROR", E_ERROR => "E_ERROR",
E_WARNING => "E_WARNING", E_WARNING => "E_WARNING",

1
src/pocketmine/utils/Utils.php
View File

@ -538,6 +538,7 @@ class Utils{
$e = new \Exception(); $e = new \Exception();
$trace = $e->getTrace(); $trace = $e->getTrace();
} }
++$start; //skip this frame
} }
$messages = []; $messages = [];