Changeset 16134 in josm for trunk

Timestamp:

2020-03-15T17:00:41+01:00 (5 years ago)

Author:

GerdP

Message:

see #18928: prevent possible endless loop in Multipolygon.joinWays()

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -599 +599 @@
                 for (int i = 0; i < joinArray.length && left != 0; ++i) {
                     Way c = joinArray[i];
-                    if (c != null && !c.isEmpty()) {
+                    if (c != null && c.isEmpty()) {
+                        joinArray[i] = null;
+                        left--;
+                    } else if (c != null && !c.isEmpty()) {
                         if (nodes == null) {
                             // new ring