Issue #24115: Update uses of PyObject_IsTrue(), PyObject_Not(),
PyObject_IsInstance(), PyObject_RichCompareBool() and _PyDict_Contains()
to check for and handle errors correctly.
diff --git a/Objects/setobject.c b/Objects/setobject.c
index 34e43b9..304519c 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -1569,9 +1569,15 @@
if (PyDict_CheckExact(other)) {
while (set_next(so, &pos, &entry)) {
setentry entrycopy;
+ int rv;
entrycopy.hash = entry->hash;
entrycopy.key = entry->key;
- if (!_PyDict_Contains(other, entry->key, entry->hash)) {
+ rv = _PyDict_Contains(other, entry->key, entry->hash);
+ if (rv < 0) {
+ Py_DECREF(result);
+ return NULL;
+ }
+ if (!rv) {
if (set_add_entry((PySetObject *)result, &entrycopy) == -1) {
Py_DECREF(result);
return NULL;
@@ -1807,7 +1813,8 @@
static PyObject *
set_richcompare(PySetObject *v, PyObject *w, int op)
{
- PyObject *r1, *r2;
+ PyObject *r1;
+ int r2;
if(!PyAnySet_Check(w))
Py_RETURN_NOTIMPLEMENTED;
@@ -1825,9 +1832,11 @@
r1 = set_richcompare(v, w, Py_EQ);
if (r1 == NULL)
return NULL;
- r2 = PyBool_FromLong(PyObject_Not(r1));
+ r2 = PyObject_IsTrue(r1);
Py_DECREF(r1);
- return r2;
+ if (r2 < 0)
+ return NULL;
+ return PyBool_FromLong(!r2);
case Py_LE:
return set_issubset(v, w);
case Py_GE: