Copy an Entry to avoid undefined behavior after the Map is modified.

RELNOTES=n/a PiperOrigin-RevId: 690334433
google · Oct 27, 2024 · ea06095 · ea06095
1 parent b650b9f
commit ea06095
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/android/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java b/android/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java
@@ -678,7 +678,10 @@ public void testEntrySetRetainAll() {
     }
 
     Set<Entry<K, V>> entrySet = map.entrySet();
-    Set<Entry<K, V>> entriesToRetain = singleton(entrySet.iterator().next());
+    Entry<K, V> originalEntry = entrySet.iterator().next();
+    // Copy the Entry, as discussed in testEntrySetRemoveAll.
+    Set<Entry<K, V>> entriesToRetain =
+        singleton(mapEntry(originalEntry.getKey(), originalEntry.getValue()));
     if (supportsRemove) {
       boolean shouldRemove = (entrySet.size() > entriesToRetain.size());
       boolean didRemove = entrySet.retainAll(entriesToRetain);

diff --git a/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java b/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java
@@ -678,7 +678,10 @@ public void testEntrySetRetainAll() {
     }
 
     Set<Entry<K, V>> entrySet = map.entrySet();
-    Set<Entry<K, V>> entriesToRetain = singleton(entrySet.iterator().next());
+    Entry<K, V> originalEntry = entrySet.iterator().next();
+    // Copy the Entry, as discussed in testEntrySetRemoveAll.
+    Set<Entry<K, V>> entriesToRetain =
+        singleton(mapEntry(originalEntry.getKey(), originalEntry.getValue()));
     if (supportsRemove) {
       boolean shouldRemove = (entrySet.size() > entriesToRetain.size());
       boolean didRemove = entrySet.retainAll(entriesToRetain);