Skip to content

Commit b4cf36f

Browse files
Merge pull request #62227 from nextcloud/backport/62208/stable33
[stable33] fix: don't die if we can't encode file metadata on upload
2 parents ca38ed7 + f0c97fd commit b4cf36f

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

lib/private/FilesMetadata/FilesMetadataManager.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,10 @@ public function saveMetadata(IFilesMetadata $filesMetadata): void {
160160
}
161161

162162
$json = json_encode($filesMetadata->jsonSerialize());
163+
if (!$json) {
164+
$this->logger->error('Failed to json encode file metadata for ' . $filesMetadata->getFileId(), ['metadata' => $filesMetadata->jsonSerialize()]);
165+
return;
166+
}
163167
if (strlen($json) > self::JSON_MAXSIZE) {
164168
$this->logger->debug('huge metadata content detected: ' . $json);
165169
throw new FilesMetadataException('json cannot exceed ' . self::JSON_MAXSIZE . ' characters long; fileId: ' . $filesMetadata->getFileId() . '; size: ' . strlen($json));

0 commit comments

Comments
 (0)