Changeset 18678 in josm for trunk/src

Timestamp:

2023-03-01T15:17:42+01:00 (21 months ago)

Author:

taylor.smock

Message:

Fix CID-1505775: Dereference null return value

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -173 +174 @@
         } else if (o instanceof IWay) {
             addBbox(o);
-            add(tr("Centroid: "), toStringCSV(false,
-                    ProjectionRegistry.getProjection().eastNorth2latlon(Geometry.getCentroid(((IWay<?>) o).getNodes()))));
+            final EastNorth centroid = Geometry.getCentroid(((IWay<?>) o).getNodes());
+            final String centroidMessage;
+            if (centroid == null) {
+                centroidMessage = tr("unknown");
+            } else {
+                centroidMessage = toStringCSV(false,
+                        ProjectionRegistry.getProjection().eastNorth2latlon(centroid));
+            }
+            add(tr("Centroid: "), centroidMessage);
             if (o instanceof Way) {
                 double length = ((Way) o).getLength();