upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-14 19:20:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix: handle exif metadata read errors gracefully

Browse source 
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
This commit is contained in:
Richard Steinmetz 2024-01-15 09:12:49 +01:00
parent baf49e3950
commit 94d7e459bc
No known key found for this signature in database
GPG key ID: 27137D9E7D273FB2
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/private/Metadata/Provider/ExifProvider.php
View file

@ -71,8 +71,9 @@ class ExifProvider implements IMetadataProvider {
$size->setId($file->getId());
$size->setArrayAsValue([]);
if (!$data) {
$sizeResult = getimagesizefromstring($file->getContent());
$content = $file->getContent();
if (!$data && $content) {
$sizeResult = getimagesizefromstring($content);
if ($sizeResult !== false) {
$size->setArrayAsValue([
'width' => $sizeResult[0],
@ -81,7 +82,7 @@ class ExifProvider implements IMetadataProvider {
$exifData['size'] = $size;
}
} elseif (array_key_exists('COMPUTED', $data)) {
} elseif ($data && array_key_exists('COMPUTED', $data)) {
if (array_key_exists('Width', $data['COMPUTED']) && array_key_exists('Height', $data['COMPUTED'])) {
$size->setArrayAsValue([
'width' => $data['COMPUTED']['Width'],