Address review

sergey-miryanov · sergey-miryanov · commit 06a01eb1827d · 2026-03-28T02:26:06.000+05:00
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -6632,17 +6632,18 @@ dictitems_xor_lock_held(PyObject *d1, PyObject *d2)
         else {
             Py_INCREF(val1);
             to_delete = PyObject_RichCompareBool(val1, val2, Py_EQ);
+            Py_CLEAR(val1);
             if (to_delete < 0) {
                 goto error;
             }
         }
 
         if (to_delete) {
+            Py_CLEAR(val2);
             if (_PyDict_DelItem_KnownHash(temp_dict, key, hash) < 0) {
                 goto error;
             }
             Py_CLEAR(key);
-            Py_CLEAR(val2);
         }
         else {
             PyObject *pair = _PyTuple_FromPairSteal(key, val2);
@@ -6656,7 +6657,6 @@ dictitems_xor_lock_held(PyObject *d1, PyObject *d2)
             }
             Py_DECREF(pair);
         }
-        Py_CLEAR(val1);
     }
 
     PyObject *remaining_pairs = PyObject_CallMethodNoArgs(

Original file line number	Diff line number	Diff line change
`@@ -6632,17 +6632,18 @@ dictitems_xor_lock_held(PyObject d1, PyObject d2)`
`6632`	`6632`	`else {`
`6633`	`6633`	`Py_INCREF(val1);`
`6634`	`6634`	`to_delete = PyObject_RichCompareBool(val1, val2, Py_EQ);`
	`6635`	`+ Py_CLEAR(val1);`
`6635`	`6636`	`if (to_delete < 0) {`
`6636`	`6637`	`goto error;`
`6637`	`6638`	`}`
`6638`	`6639`	`}`
`6639`	`6640`
`6640`	`6641`	`if (to_delete) {`
	`6642`	`+ Py_CLEAR(val2);`
`6641`	`6643`	`if (_PyDict_DelItem_KnownHash(temp_dict, key, hash) < 0) {`
`6642`	`6644`	`goto error;`
`6643`	`6645`	`}`
`6644`	`6646`	`Py_CLEAR(key);`
`6645`		`- Py_CLEAR(val2);`
`6646`	`6647`	`}`
`6647`	`6648`	`else {`
`6648`	`6649`	`PyObject *pair = _PyTuple_FromPairSteal(key, val2);`
`@@ -6656,7 +6657,6 @@ dictitems_xor_lock_held(PyObject d1, PyObject d2)`
`6656`	`6657`	`}`
`6657`	`6658`	`Py_DECREF(pair);`
`6658`	`6659`	`}`
`6659`		`- Py_CLEAR(val1);`
`6660`	`6660`	`}`
`6661`	`6661`
`6662`	`6662`	`PyObject *remaining_pairs = PyObject_CallMethodNoArgs(`