diff options
| author | Guido van Rossum <guido@python.org> | 2007-05-29 00:39:44 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-05-29 00:39:44 (GMT) |
| commit | 29478ef990eadb04c9c1ff4a803b7c5172b31399 (patch) | |
| tree | 2d29571026d885abfb46119d97629880e1ceef78 /Objects | |
| parent | 644e149b111064c77743be89a948b710350f3d49 (diff) | |
| download | cpython-29478ef990eadb04c9c1ff4a803b7c5172b31399.zip cpython-29478ef990eadb04c9c1ff4a803b7c5172b31399.tar.gz cpython-29478ef990eadb04c9c1ff4a803b7c5172b31399.tar.bz2 | |
Merged revisions 55588-55630 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55598 | neal.norwitz | 2007-05-26 10:44:02 +0800 (Sat, 26 May 2007) | 1 line
Fix refleak on infinite recursion
........
r55599 | neal.norwitz | 2007-05-26 10:47:45 +0800 (Sat, 26 May 2007) | 1 line
Add news entry about overidding isinstance/issubclass (PEP 3119)
........
r55629 | brett.cannon | 2007-05-29 08:06:59 +0800 (Tue, 29 May 2007) | 3 lines
Delete the cstubs module. Used as input to Modules/cgen.py to generate the gl
module which has already been removed.
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/abstract.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index dc66893..20e1711 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2137,8 +2137,10 @@ PyObject_IsInstance(PyObject *inst, PyObject *cls) if (checker != NULL) { PyObject *res; int ok = -1; - if (Py_EnterRecursiveCall(" in __instancecheck__")) + if (Py_EnterRecursiveCall(" in __instancecheck__")) { + Py_DECREF(checker); return ok; + } res = PyObject_CallFunctionObjArgs(checker, inst, NULL); Py_LeaveRecursiveCall(); Py_DECREF(checker); |