Fix a NULL-deref in CoverArtController.java

ImageIO.read() can return null in certain cases
2019-07-14 11:54:30 -06:00
parent e9ea61036f
commit eccb7e08f5
1 changed files with 4 additions and 1 deletions
@@ -381,7 +381,10 @@ public class CoverArtController implements LastModified {
                InputStream in = null;
                try {
                    in = getImageInputStream(coverArt);
-                    return scale(ImageIO.read(in), size, size);
+                    BufferedImage bimg = ImageIO.read(in);
+                    if (bimg != null) {
+                      return scale(bimg, size, size);
+                    }
                } catch (Throwable x) {
                    LOG.warn("Failed to process cover art " + coverArt + ": " + x, x);
                } finally {