BUGFIX: Handle empty files correctly in check

Fixes sitegeist#4
kdambekalns · Nov 18, 2022 · 6aa5888 · 6aa5888
1 parent 7a4f80c
commit 6aa5888
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/Classes/Service/ThumbnailOptimizationService.php b/Classes/Service/ThumbnailOptimizationService.php
@@ -79,6 +79,14 @@ public function optimizeThumbnail(Thumbnail $thumbnail)
         fclose($resourceStream);
         fclose($temporaryFileHandle);
 
+        $filesizeOriginal = filesize($tmpFileInput);
+        if ((bool)$filesizeOriginal === false) {
+            $this->logger->error(sprintf('Creating temporary copy of original image "%s" resulted in empty file', $thumbnail->getOriginalAsset()->getLabel()), $output);
+            unlink($tmpFileInput);
+            unlink($tmpFileOptimized);
+            return;
+        }
+
         $shellCommand = str_replace(
             ['{input}', '{output}'],
             [escapeshellarg($tmpFileInput), escapeshellarg($tmpFileOptimized)],
@@ -96,11 +104,9 @@ public function optimizeThumbnail(Thumbnail $thumbnail)
             return;
         }
 
-        $filesizeOriginal = filesize($tmpFileInput);
         $filesizeOptimized = filesize($tmpFileOptimized);
-
-        if ((bool)$filesizeOriginal === false || (bool)$filesizeOptimized === false) {
-            $this->logger->error(sprintf('Optimizing image "%s" with command "%s" resulted in empty files', $thumbnail->getOriginalAsset()->getLabel(), $shellCommand), $output);
+        if ((bool)$filesizeOptimized === false) {
+            $this->logger->error(sprintf('Optimizing image "%s" with command "%s" resulted in empty file', $thumbnail->getOriginalAsset()->getLabel(), $shellCommand), $output);
             unlink($tmpFileInput);
             unlink($tmpFileOptimized);
             return;