mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-14 00:54:01 +02:00
Code Issues Releases Wiki Activity

Handle depth to avoid cases where an exception has many too many previous exceptions, fixes #1726

Browse Source
This commit is contained in:
Jordi Boggiano
2022-07-22 14:18:01 +02:00
parent ffc2bc2e23
commit 83db4b3f81
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Monolog/Formatter/LineFormatter.php
View File

@@ -153,6 +153,12 @@ class LineFormatter extends NormalizerFormatter
if ($previous = $e->getPrevious()) { if ($previous = $e->getPrevious()) {
do { do {
$depth++;
if ($depth > $this->maxNormalizeDepth) {
$str .= '\n[previous exception] Over ' . $this->maxNormalizeDepth . ' levels deep, aborting normalization';
break;
}
$str .= "\n[previous exception] " . $this->formatException($previous); $str .= "\n[previous exception] " . $this->formatException($previous);
} while ($previous = $previous->getPrevious()); } while ($previous = $previous->getPrevious());
} }

4
src/Monolog/Formatter/NormalizerFormatter.php
View File

@@ -198,6 +198,10 @@ class NormalizerFormatter implements FormatterInterface
*/ */
protected function normalizeException(Throwable $e, int $depth = 0) protected function normalizeException(Throwable $e, int $depth = 0)
{ {
if ($depth > $this->maxNormalizeDepth) {
return ['Over ' . $this->maxNormalizeDepth . ' levels deep, aborting normalization'];
}
if ($e instanceof \JsonSerializable) { if ($e instanceof \JsonSerializable) {
return (array) $e->jsonSerialize(); return (array) $e->jsonSerialize();
} }