ACP2E-2970: Old media gallery fails to render images when a 0-byte image is placed in the directory

Author: thiaramus

app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php

@@ -415,7 +415,7 @@ public function getFilesCollection($path, $type = null)
             $mimeType = $itemStats['mimetype'] ?? $this->mime->getMimeType($item->getFilename());
             $item->setMimeType($mimeType);
 
-            if ($this->isImage($item->getBasename())) {
+            if ($this->isImage($item->getBasename()) && $item->getSize() > 0) {
                 $thumbUrl = $this->getThumbnailUrl($item->getFilename(), true);
                 // generate thumbnail "on the fly" if it does not exists
                 if (!$thumbUrl) {
@@ -435,6 +435,12 @@ public function getFilesCollection($path, $type = null)
                     $this->logger->notice(sprintf("GetImageSize caused error: %s", $e->getMessage()));
                 }
             } else {
+                $this->logger->warning(
+                    sprintf(
+                        "The image %s is invalid and cannot be displayed in the gallery.",
+                        $item->getBasename()
+                    )
+                );
                 $thumbUrl = $this->_assetRepo->getUrl(self::THUMB_PLACEHOLDER_PATH_SUFFIX);
             }