ada/cpython
0
0
Fork 0
mirror of https://github.com/AdaCore/cpython.git synced 2026-02-12 12:57:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

backport:

Browse Source 
revision 2.196
date: 2002/12/07 21:39:16;  author: tim_one;  state: Exp;  lines: +27 -28
slot_nb_nonzero():  Another leak uncovered by the sandbox datetime
tests.  I found the logic too confusing to follow here, so rewrote more
than was likely absolutely necessary.
This commit is contained in:
Neal Norwitz
2003-02-02 19:59:59 +00:00
parent 5a245e4d13
commit e8c4f9457e
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Objects/typeobject.c
View File

@@ -3113,26 +3113,29 @@ SLOT0(slot_nb_absolute, "__abs__")
static int
slot_nb_nonzero(PyObject *self)
{
PyObject *func, *res;
PyObject *func, *args;
static PyObject *nonzero_str, *len_str;
int result = -1;
func = lookup_maybe(self, "__nonzero__", &nonzero_str);
if (func == NULL) {
if (PyErr_Occurred())
return -1;
func = lookup_maybe(self, "__len__", &len_str);
if (func == NULL) {
if (PyErr_Occurred())
return -1;
else
return 1;
if (func == NULL)
return PyErr_Occurred() ? -1 : 1;
}
args = PyTuple_New(0);
if (args != NULL) {
PyObject *temp = PyObject_Call(func, args, NULL);
Py_DECREF(args);
if (temp != NULL) {
result = PyObject_IsTrue(temp);
Py_DECREF(temp);
}
}
res = PyObject_CallObject(func, NULL);
Py_DECREF(func);
if (res == NULL)
return -1;
return PyObject_IsTrue(res);
return result;
}
SLOT0(slot_nb_invert, "__invert__")