mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6198 from nextcloud/stable11-check-encoding-log 

[stable11] Ensure log message is UTF-8 encoded
This commit is contained in:
Roeland Jago Douma 2017-08-22 09:08:21 +02:00 committed by GitHub
parent 2f0e7b16fb d5c2f7f7af
commit 9a26a3e8d7
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/Log/File.php
View File

@ -114,7 +114,18 @@ class File {
'user',
'version'
);
$entry = json_encode($entry);
// PHP's json_encode only accept proper UTF-8 strings, loop over all
// elements to ensure that they are properly UTF-8 compliant or convert
// them manually.
foreach($entry as $key => $value) {
if(is_string($value)) {
$testEncode = json_encode($value);
if($testEncode === false) {
$entry[$key] = utf8_encode($value);
}
}
}
$entry = json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR);
$handle = @fopen(self::$logFile, 'a');
@chmod(self::$logFile, 0640);
if ($handle) {