Changeset 18599 in josm for trunk/src/org

Timestamp:

2022-11-17T20:28:17+01:00 (17 months ago)

Author:

taylor.smock

Message:

Fix CID 1500633 and 1500634: dereference null return value

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/street_level/IImageEntry.java (modified) (1 diff)
• gui/layer/geoimage/ImageViewerDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/street_level/IImageEntry.java

@@ -147 +147 @@
     default BufferedImage read(Dimension target) throws IOException {
         URI imageUrl = getImageURI();
+        if (imageUrl == null) {
+            return null;
+        }
         Logging.info(tr("Loading {0}", imageUrl));
         BufferedImage image = ImageProvider.read(imageUrl.toURL(), false, false,

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

@@ -609 +609 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            if (currentEntry != null) {
+            if (currentEntry != null && currentEntry.getImageURI() != null) {
                 try {
                     PlatformManager.getPlatform().openUrl(currentEntry.getImageURI().toURL().toExternalForm());