diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-07-18 17:55:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 17:55:45 +0200 |
| commit | 844c7408686f2262aaab322f91fb61a18cbfa0ad (patch) | |
| tree | fec2daae05fa3d11dc21aea125136986b1333308 | |
| parent | ad9b458c7437e20be7d5a93ce383effe354bfeba (diff) | |
| parent | 99c00972a026ca747013b42c466747d617cb0051 (diff) | |
| download | nextcloud-server-844c7408686f2262aaab322f91fb61a18cbfa0ad.tar.gz nextcloud-server-844c7408686f2262aaab322f91fb61a18cbfa0ad.zip | |
Merge pull request #10284 from nextcloud/exceptionserializer-isset
make exception serializer a bit more robust
| -rw-r--r-- | lib/private/Log/ExceptionSerializer.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/private/Log/ExceptionSerializer.php b/lib/private/Log/ExceptionSerializer.php index ecba043da44..768c6484963 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 +} |