Changeset 18987 in josm

Timestamp:

2024-02-16T08:53:31+01:00 (12 months ago)

Author:

GerdP

Message:

fix #23477: crash when undoing changes while in extrude mode

• add sanity checks in performExtrusion() to detect when undo was pressed, this always cancels the current extrude
• removes the try/catch clause which might hide a data corruption (reverts r12512)

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -39 +39 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.ILatLon;
-import org.openstreetmap.josm.data.osm.DataIntegrityProblemException;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -82 +81 @@
     private transient WaySegment selectedSegment;
     private transient Node selectedNode;
+    private transient Command lastCommandOnUndoStack;
     private Color mainColor;
     private transient Stroke mainStroke;
@@ -332 +332 @@
         this.selectedNode = null;
         this.selectedSegment = null;
+        this.lastCommandOnUndoStack = null;
         super.exitMode();
     }
@@ -402 +403 @@
         // If nothing gets caught, stay in select mode
         if (selectedSegment == null && selectedNode == null) return;
+        lastCommandOnUndoStack = UndoRedoHandler.getInstance().getLastCommand();
 
         if (selectedNode != null) {
@@ -546 +548 @@
                     addNewNode(e);
                 } else if (e.getPoint().distance(initialMousePos) > initialMoveThreshold && newN1en != null && selectedSegment != null) {
-                    try {
-                        // main extrusion commands
-                        performExtrusion();
-                    } catch (DataIntegrityProblemException ex) {
-                        // Can occur if calling undo while extruding, see #12870
-                        Logging.error(ex);
-                    }
+                    // main extrusion commands
+                    performExtrusion();
                 }
             } else if (mode == Mode.translate || mode == Mode.translate_node) {
@@ -567 +564 @@
             mapView.removeTemporaryLayer(this);
             selectedSegment = null;
+            lastCommandOnUndoStack = null;
             moveCommand = null;
             mode = Mode.select;
@@ -639 +637 @@
      */
     private void performExtrusion() {
+        // sanity checks, see #23447 and #12870: don't try to extrude when user pressed undo
+        if (lastCommandOnUndoStack != UndoRedoHandler.getInstance().getLastCommand())
+            return;
         DataSet ds = getLayerManager().getEditDataSet();
+        if (ds.getPrimitiveById(selectedSegment.getWay()) == null || !selectedSegment.isUsable())
+            return;
+
         // create extrusion
         Collection<Command> cmds = new LinkedList<>();