Changeset 13992 in josm for trunk

Timestamp:

2018-06-30T22:40:24+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16443 - add robustness to invalid preferences when loading recent tag collection

File:

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

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.search.SearchSetting;
 import org.openstreetmap.josm.data.preferences.ListProperty;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -47 +48 @@
     public void loadFromPreference(ListProperty property) {
         recentTags.clear();
-        Iterator<String> it = property.get().iterator();
+        List<String> list = property.get();
+        Iterator<String> it = list.iterator();
         while (it.hasNext()) {
             String key = it.next();
-            String value = it.next();
-            add(new Tag(key, value));
+            if (it.hasNext()) {
+                String value = it.next();
+                add(new Tag(key, value));
+            } else {
+                Logging.error("Invalid or incomplete list property: " + list);
+                break;
+            }
         }
     }