Issue #24583: Fix crash when set is mutated while being updated.

diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py
index 9f96f875c5d22d1038ac6ffabb83bae2e3cf7a24..54de508a832de4f6c7fb7be3df0b91c8470a92bc 100644 (file)
--- a/Lib/test/test_set.py
+++ b/Lib/test/test_set.py
@@ -1742,6 +1742,19 @@ class TestWeirdBugs(unittest.TestCase):
         s.update(range(100))
         list(si)
 
+    def test_merge_and_mutate(self):
+        class X:
+            def __hash__(self):
+                return hash(0)
+            def __eq__(self, o):
+                other.clear()
+                return False
+
+        other = set()
+        other = {X() for i in range(10)}
+        s = {0}
+        s.update(other)
+
 # Application tests (based on David Eppstein's graph recipes ====================================
 
 def powerset(U):

diff --git a/Misc/NEWS b/Misc/NEWS
index bb7e04d7b878645dcc569f60b77d51d22f4df52c..e1d78ad314abc39034021cbe026ad337eba9fda4 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ Core and Builtins
 
 - Issue #24569: Make PEP 448 dictionary evaluation more consistent.
 
+- Issue #24583: Fix crash when set is mutated while being updated.
+
 - Issue #24407: Fix crash when dict is mutated while being updated.
 
 Library

diff --git a/Objects/setobject.c b/Objects/setobject.c
index d962c1e44a0431ba4aeed2de1c2d882380d14941..704d7e2b2a76ec2db079eb275592a76f69886937 100644 (file)
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -600,7 +600,8 @@ set_merge(PySetObject *so, PyObject *otherset)
     }
 
     /* We can't assure there are no duplicates, so do normal insertions */
-    for (i = 0; i <= other->mask; i++, other_entry++) {
+    for (i = 0; i <= other->mask; i++) {
+        other_entry = &other->table[i];
         key = other_entry->key;
         if (key != NULL && key != dummy) {
             Py_INCREF(key);