Changeset 18617 in josm for trunk/src/org

Timestamp:

2022-12-21T19:27:55+01:00 (16 months ago)

Author:

taylor.smock

Message:

Fix #22580: AbstractPrimitive#putAll was not creating a copy of the keys array

This broke the RCU contract (Read-Copy-Update), since we were not modifying a
copy of the array.

File:

• trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -624 +624 @@
         }
         // Defensive copy of keys
-        String[] newKeys = keys;
+        final String[] tKeys = this.keys; // Used to avoid highly unlikely NPE (from a race) during clone operation.
+        String[] newKeys = tKeys == null ? null : tKeys.clone();
         Map<String, String> originalKeys = getKeys();
         List<Map.Entry<String, String>> tagsToAdd = new ArrayList<>(tags.size());
@@ -630 +631 @@
             if (!Utils.isBlank(tag.getKey())) {
                 int keyIndex = indexOfKey(newKeys, tag.getKey());
-                // Realistically, we will not hit the newKeys == null branch. If it is null, keyIndex is always < 1
+                // Realistically, we will not hit the newKeys == null branch. If it is null, keyIndex is always < 0
                 if (keyIndex < 0 || newKeys == null) {
                     tagsToAdd.add(tag);