summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2011-10-30 12:35:39 (GMT)
committerPetri Lehtinen <petri@digip.org>2011-10-30 12:35:39 (GMT)
commitc34f5c256a4c528d5d1105deee5eeeac944e4b91 (patch)
tree20330284c6081de9c926814fe70046ca486dc5f0 /Objects
parent7c5e34d8a3859cd7ff505873f5bddb507f0c8cb3 (diff)
parente0aa8037149c24f9fe8c37c2e129eb904723a3a6 (diff)
downloadcpython-c34f5c256a4c528d5d1105deee5eeeac944e4b91.zip
cpython-c34f5c256a4c528d5d1105deee5eeeac944e4b91.tar.gz
cpython-c34f5c256a4c528d5d1105deee5eeeac944e4b91.tar.bz2
Fix the return value of set_discard (issue #10519)
Diffstat (limited to 'Objects')
-rw-r--r--Objects/setobject.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Objects/setobject.c b/Objects/setobject.c
index 8becb41..a402e20 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -1917,9 +1917,10 @@ set_discard(PySetObject *so, PyObject *key)
tmpkey = make_new_set(&PyFrozenSet_Type, key);
if (tmpkey == NULL)
return NULL;
- result = set_discard_key(so, tmpkey);
+ rv = set_discard_key(so, tmpkey);
Py_DECREF(tmpkey);
- return result;
+ if (rv == -1)
+ return NULL;
}
Py_RETURN_NONE;
}