sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10284 from nextcloud/exceptionserializer-isset 

make exception serializer a bit more robust
pull/10294/head
Roeland Jago Douma 2018-07-18 17:55:45 +07:00 committed by GitHub
parent ad9b458c74 99c00972a0
commit 844c740868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/Log/ExceptionSerializer.php
Unescape Escape View File

@ -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;
}
}
}