fix: handle exif metadata read errors gracefully

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
nextcloud · Jan 15, 2024 · 8f0ab22 · 8f0ab22
1 parent af00330
commit 8f0ab22
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/private/Metadata/Provider/ExifProvider.php b/lib/private/Metadata/Provider/ExifProvider.php
@@ -67,8 +67,8 @@ public function execute(File $file): array {
 		$size->setId($file->getId());
 		$size->setArrayAsValue([]);
 
-		if (!$data) {
-			$sizeResult = getimagesizefromstring($file->getContent());
+		if (!$data && ($content = $file->getContent())) {
+			$sizeResult = getimagesizefromstring($content);
 			if ($sizeResult !== false) {
 				$size->setArrayAsValue([
 					'width' => $sizeResult[0],
@@ -77,7 +77,7 @@ public function execute(File $file): array {
 
 				$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'],