Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #16060: Fix a double DECREF in int() implementation. Thanks Serhiy Storchaka.

This commit is contained in:
Mark Dickinson 2012-09-27 19:38:59 +01:00
parent 0beb4d28d0
commit 3d7838593b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -12,6 +12,9 @@ Core and Builtins
- Issue #16046: Fix loading sourceless legacy .pyo files.
- Issue #16060: Fix refcounting bug when __trunc__ returns an object
whose __int__ gives a non-integer. Patch by Serhiy Storchaka.
Library
-------

7
Objects/abstract.c
View File

@ -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);