fix: halo-dev#1022 (halo-dev#1025)

Co-authored-by: xiangbei.yzx <[email protected]>

src/main/java/run/halo/app/exception/ImageFormatException.java

@@ -0,0 +1,18 @@
+package run.halo.app.exception;
+
+/**
+ * Image format exception.
+ *
+ * @author ZhiXiang Yuan
+ * @date 2020/08/10 02:11
+ */
+public class ImageFormatException extends BadRequestException {
+
+    public ImageFormatException(String message) {
+        super(message);
+    }
+
+    public ImageFormatException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

src/main/java/run/halo/app/utils/ImageUtils.java

@@ -2,6 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import net.sf.image4j.codec.ico.ICODecoder;
+import run.halo.app.exception.ImageFormatException;
 
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
@@ -24,7 +25,11 @@ public static BufferedImage getImageFromFile(InputStream is, String extension) t
         log.debug("Current File type is : [{}]", extension);
 
         if (EXTENSION_ICO.equals(extension)) {
-            return ICODecoder.read(is).get(0);
+            try {
+                return ICODecoder.read(is).get(0);
+            } catch (IOException e) {
+                throw new ImageFormatException("ico 文件已损坏", e);
+            }
         } else {
             return ImageIO.read(is);
         }