Changeset 35908 in osm

Timestamp:

2022-02-07T15:39:46+01:00 (2 years ago)

Author:

taylor.smock

Message:

building_tools: Add NPE check in EDT along with a defensive copy

This fixes #21833: NPE: Cannot invoke "org.openstreetmap.josm.data.coor.EastNorth.east()".
This is caused by something either calling the reset method *or* one of the
methods for calculating the EastNorth returning null.

In any case, we fix the potential race condition by making a defensive copy of
the en array, and then checking the defensive copy for nulls in the EDT,
where appropriate.

Location:

applications/editors/josm

Files:

• dist/buildings_tools.jar (modified) ( previous)
• plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/Building.java (modified) (1 diff)

applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/Building.java

@@ -210 +210 @@
 
     public void paint(Graphics2D g, MapView mv) {
-        if (len == 0)
+        // Make a local copy to avoid other threads resetting what we are drawing.
+        // See JOSM #21833 for at least one instance where _something_ happens to cause
+        // an NPE here.
+        final EastNorth[] temporaryEnArray = Arrays.copyOf(en, en.length);
+        if (len == 0 || temporaryEnArray[0] == null || temporaryEnArray[1] == null) {
             return;
+        }
         GeneralPath b = new GeneralPath();
-        Point pp1 = mv.getPoint(eastNorth2latlon(en[0]));
-        Point pp2 = mv.getPoint(eastNorth2latlon(en[1]));
+        Point pp1 = mv.getPoint(eastNorth2latlon(temporaryEnArray[0]));
+        Point pp2 = mv.getPoint(eastNorth2latlon(temporaryEnArray[1]));
         b.moveTo(pp1.x, pp1.y);
         b.lineTo(pp2.x, pp2.y);
-        if (ToolSettings.Shape.RECTANGLE == ToolSettings.getShape()) {
-            Point pp3 = mv.getPoint(eastNorth2latlon(en[2]));
-            Point pp4 = mv.getPoint(eastNorth2latlon(en[3]));
+        if (ToolSettings.Shape.RECTANGLE == ToolSettings.getShape()
+                && temporaryEnArray[2] != null && temporaryEnArray[3] != null) {
+            Point pp3 = mv.getPoint(eastNorth2latlon(temporaryEnArray[2]));
+            Point pp4 = mv.getPoint(eastNorth2latlon(temporaryEnArray[3]));
             b.lineTo(pp3.x, pp3.y);
             b.lineTo(pp4.x, pp4.y);