diff options
| author | Mark Dickinson <mdickinson@enthought.com> | 2012-09-27 19:38:59 +0100 |
|---|---|---|
| committer | Mark Dickinson <mdickinson@enthought.com> | 2012-09-27 19:38:59 +0100 |
| commit | c19f677fb7350924e56970c294dcdb292b2fefac (patch) | |
| tree | 52aa13a2ca2ff1eb12ef7bf821c60ffc501cdc1b /Objects | |
| parent | 9f1ce8e27383fbe10e6efedbf0b657a0cfca30b4 (diff) | |
| download | cpython-c19f677fb7350924e56970c294dcdb292b2fefac.tar.gz | |
Issue #16060: Fix a double DECREF in int() implementation. Thanks Serhiy Storchaka.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/abstract.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index ed5e196843..a2737dd5f4 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -1228,11 +1228,10 @@ convert_integral_to_int(PyObject *integral, const char *error_format) nb = Py_TYPE(integral)->tp_as_number; if (nb->nb_int) { PyObject *as_int = nb->nb_int(integral); - Py_DECREF(integral); - if (!as_int) - return NULL; - if (PyLong_Check(as_int)) + if (!as_int || PyLong_Check(as_int)) { + Py_DECREF(integral); return as_int; + } Py_DECREF(as_int); } PyErr_Format(PyExc_TypeError, error_format, Py_TYPE(integral)->tp_name); |