[Python-checkins] cpython: Issue #16060: Fix a double DECREF in int() implementation. Thanks Serhiy
mark.dickinson
python-checkins at python.org
Thu Sep 27 20:39:18 CEST 2012
http://hg.python.org/cpython/rev/690287f8ea95
changeset: 79198:690287f8ea95
user: Mark Dickinson <mdickinson at enthought.com>
date: Thu Sep 27 19:38:59 2012 +0100
summary:
Issue #16060: Fix a double DECREF in int() implementation. Thanks Serhiy Storchaka.
files:
Lib/test/test_int.py | 12 ++++++++++++
Misc/NEWS | 3 +++
Objects/abstract.c | 7 +++----
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py
--- a/Lib/test/test_int.py
+++ b/Lib/test/test_int.py
@@ -305,6 +305,18 @@
self.fail("Failed to raise TypeError with %s" %
((base, trunc_result_base),))
+ # Regression test for bugs.python.org/issue16060.
+ class BadInt(trunc_result_base):
+ def __int__(self):
+ return 42.0
+
+ class TruncReturnsBadInt(base):
+ def __trunc__(self):
+ return BadInt()
+
+ with self.assertRaises(TypeError):
+ int(TruncReturnsBadInt())
+
def test_error_message(self):
testlist = ('\xbd', '123\xbd', ' 123 456 ')
for s in testlist:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
Core and Builtins
-----------------
+- Issue #16060: Fix refcounting bug when __trunc__ returns an object
+ whose __int__ gives a non-integer. Patch by Serhiy Storchaka.
+
- Issue #16046: Fix loading sourceless legacy pyos.
- Issue #15379: Fix passing of non-BMP characters as integers for the charmap
diff --git a/Objects/abstract.c b/Objects/abstract.c
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1228,11 +1228,10 @@
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);
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list