Changeset 19461 in josm for trunk

Timestamp:

2026-01-14T21:32:17+01:00 (41 hours ago)

Author:

stoecker

Message:

should fix Coverity CID 1347996 and CID 1476016

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java

@@ -38 +38 @@
      * ImageIcon can change while the image is loading.
      */
-    private Image img;
+    private volatile Image img;
     private ImageResource imageResource;
 
@@ -80 +80 @@
      * A cache that holds a disabled (gray) version of this image
      */
-    private BufferedImage disabledImgCache;
+    private volatile BufferedImage disabledImgCache;
 
     /**
@@ -142 +142 @@
         // This should fix #21919: NPE due to disabledImgCache being null (race condition with #loadImage())
         synchronized (this) {
-            Image disImg = GuiHelper.getDisabledImage(img);
-            if (disImg instanceof BufferedImage) {
-                disabledImgCache = (BufferedImage) disImg;
-            } else {
-                disabledImgCache = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_ARGB);
-                Graphics g = disabledImgCache.getGraphics();
-                g.drawImage(disImg, 0, 0, null);
-                g.dispose();
+            if(disabledImgCache != null) {
+                Image disImg = GuiHelper.getDisabledImage(img);
+                if (disImg instanceof BufferedImage) {
+                    disabledImgCache = (BufferedImage) disImg;
+                } else {
+                    disabledImgCache = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_ARGB);
+                    Graphics g = disabledImgCache.getGraphics();
+                    g.drawImage(disImg, 0, 0, null);
+                    g.dispose();
+                }
             }
         }