Changeset 18108 in josm

Timestamp:

2021-08-01T22:00:25+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21175 - fix NPE

Location:

trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Files:

• ImageEntry.java (modified) (5 diffs)
• ThumbsLoader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.layer.geoimage;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Dimension;
@@ -15 +17 @@
 import java.util.Objects;
 
+import javax.imageio.IIOParam;
+import javax.imageio.ImageReadParam;
+import javax.imageio.ImageReader;
+
 import org.openstreetmap.josm.data.ImageData;
 import org.openstreetmap.josm.data.gpx.GpxImageEntry;
@@ -20 +26 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
-
-import javax.imageio.IIOParam;
-import javax.imageio.ImageReadParam;
-import javax.imageio.ImageReader;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -139 +139 @@
      * Reads the image represented by this entry in the given target dimension.
      * @param target the desired dimension used for {@linkplain IIOParam#setSourceSubsampling subsampling} or {@code null}
-     * @return the read image
+     * @return the read image, or {@code null}
      * @throws IOException if any I/O error occurs
      */
@@ -147 +147 @@
         BufferedImage image = ImageProvider.read(imageUrl, false, false,
                 r -> target == null ? r.getDefaultReadParam() : withSubsampling(r, target));
+        if (image == null) {
+            Logging.warn("Unable to load {0}", imageUrl);
+            return null;
+        }
         Logging.debug("Loaded {0} with dimensions {1}x{2} memoryTaken={3}m exifOrientationSwitchedDimension={4}",
                 imageUrl, image.getWidth(), image.getHeight(), image.getWidth() * image.getHeight() * 4 / 1024 / 1024,

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

@@ -114 +114 @@
         }
 
-        if (img.getWidth() <= 0 || img.getHeight() <= 0) {
+        if (img == null || img.getWidth() <= 0 || img.getHeight() <= 0) {
             Logging.error(" Invalid image");
             return null;