Fix the return value of set_discard (issue #10519)

akheron · akheron · commit e0aa8037149c · 2011-10-30T14:35:12.000+02:00
diff --git a/Objects/setobject.c b/Objects/setobject.c
@@ -1942,9 +1942,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;
 }

Original file line number	Diff line number	Diff line change
`@@ -1942,9 +1942,10 @@ set_discard(PySetObject so, PyObject key)`
`1942`	`1942`	`tmpkey = make_new_set(&PyFrozenSet_Type, key);`
`1943`	`1943`	`if (tmpkey == NULL)`
`1944`	`1944`	`return NULL;`
`1945`		`- result = set_discard_key(so, tmpkey);`
	`1945`	`+ rv = set_discard_key(so, tmpkey);`
`1946`	`1946`	`Py_DECREF(tmpkey);`
`1947`		`- return result;`
	`1947`	`+ if (rv == -1)`
	`1948`	`+ return NULL;`
`1948`	`1949`	`}`
`1949`	`1950`	`Py_RETURN_NONE;`
`1950`	`1951`	`}`