Merge branch 'pr-34883' into 2.4-develop-prs

Author: ishakhsuvarov

app/code/Magento/MediaStorage/Model/File/Validator/Image.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\File\Mime;
 use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Image\Factory;
 
 /**
  * Image validator
@@ -33,20 +34,28 @@ class Image extends \Zend_Validate_Abstract
      */
     private $fileMime;
 
+    /**
+     * @var Factory
+     */
+    private $imageFactory;
+
     /**
      * @var File
      */
     private $file;
 
     /**
      * @param Mime $fileMime
+     * @param Factory $imageFactory
      * @param File $file
      */
     public function __construct(
         Mime $fileMime,
+        Factory $imageFactory,
         File $file
     ) {
         $this->fileMime = $fileMime;
+        $this->imageFactory = $imageFactory;
         $this->file = $file;
     }
 
@@ -60,10 +69,8 @@ public function isValid($filePath): bool
 
         if (in_array($fileMimeType, $this->imageMimeTypes)) {
             try {
-                //phpcs:ignore Magento2.Functions.DiscouragedFunction
-                $image = imagecreatefromstring($this->file->fileGetContents($filePath));
-
-                $isValid = $image ? true : false;
+                $image = $this->imageFactory->create($filePath);
+                $image->open();
             } catch (\Exception $e) {
                 $isValid = false;
             }

lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php

@@ -104,7 +104,15 @@ public function open($filename)
         $this->_getFileAttributes();
 
         try {
-            $this->_imageHandler = new \Imagick($this->_fileName);
+            if (is_callable('exif_imagetype')) {
+                $fileType = exif_imagetype($this->_fileName);
+
+                if ($fileType === IMAGETYPE_ICO) {
+                    $filename = 'ico:' . $this->_fileName;
+                }
+            }
+
+            $this->_imageHandler = new \Imagick($filename);
         } catch (\ImagickException $e) {
             //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new LocalizedException(