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

@@ -423,13 +423,22 @@ public function getFilesCollection($path, $type = null)
                 }
 
                 try {
-                    $size = getimagesizefromstring(
-                        $driver->fileGetContents($item->getFilename())
-                    );
-
-                    if (is_array($size)) {
-                        $item->setWidth($size[0]);
-                        $item->setHeight($size[1]);
+                    if ($item->getSize() > 0) {
+                        $size = getimagesizefromstring(
+                            $driver->fileGetContents($item->getFilename())
+                        );
+
+                        if (is_array($size)) {
+                            $item->setWidth($size[0]);
+                            $item->setHeight($size[1]);
+                        }
+                    } else {
+                        $this->logger->notice(
+                            sprintf(
+                                "The image file %s cannot be processed by the Gallery because it has an invalid size.",
+                                $item->getFilename()
+                            )
+                        );
                     }
                 } catch (\Error $e) {
                     $this->logger->notice(sprintf("GetImageSize caused error: %s", $e->getMessage()));