Issue #17715: Add missing NULL Check to PyNumber_Long.

This commit is contained in:
Mark Dickinson 2013-04-13 17:44:44 +01:00
parent b4fd468f12
commit c9734484ca
3 changed files with 11 additions and 0 deletions

View File

@ -313,6 +313,12 @@ class IntTestCases(unittest.TestCase):
return 42
self.assertEqual(int(JustTrunc()), 42)
class ExceptionalTrunc(base):
def __trunc__(self):
1 / 0
with self.assertRaises(ZeroDivisionError):
int(ExceptionalTrunc())
for trunc_result_base in (object, Classic):
class Integral(trunc_result_base):
def __int__(self):

View File

@ -12,6 +12,9 @@ What's New in Python 3.3.2?
Core and Builtins
-----------------
- Issue #17715: Fix segmentation fault from raising an exception in a __trunc__
method.
- Issue #16447: Fixed potential segmentation fault when setting __name__ on a
class.

View File

@ -1293,6 +1293,8 @@ PyNumber_Long(PyObject *o)
PyObject *truncated = PyEval_CallObject(trunc_func, NULL);
PyObject *int_instance;
Py_DECREF(trunc_func);
if (truncated == NULL)
return NULL;
/* __trunc__ is specified to return an Integral type,
but int() needs to return a int. */
int_instance = convert_integral_to_int(truncated,