From 99c00972a026ca747013b42c466747d617cb0051 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 18 Jul 2018 14:42:05 +0200 Subject: [PATCH] make exception serializer a bit more robust Signed-off-by: Robin Appelman --- lib/private/Log/ExceptionSerializer.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/private/Log/ExceptionSerializer.php b/lib/private/Log/ExceptionSerializer.php index ecba043da4..768c648496 100644 --- a/lib/private/Log/ExceptionSerializer.php +++ b/lib/private/Log/ExceptionSerializer.php @@ -82,7 +82,9 @@ class ExceptionSerializer { return $traceLine; }, $trace); return array_map(function (array $traceLine) use ($sensitiveValues) { - $traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues); + if (isset($traceLine['args'])) { + $traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues); + } return $traceLine; }, $trace); } @@ -101,7 +103,9 @@ class ExceptionSerializer { private function encodeTrace($trace) { $filteredTrace = $this->filterTrace($trace); return array_map(function (array $line) { - $line['args'] = array_map([$this, 'encodeArg'], $line['args']); + if (isset($line['args'])) { + $line['args'] = array_map([$this, 'encodeArg'], $line['args']); + } return $line; }, $filteredTrace); } @@ -138,4 +142,4 @@ class ExceptionSerializer { return $data; } -} \ No newline at end of file +}