From fe7aa49f24743f834bcf123fcd9ea5cc7a123209 Mon Sep 17 00:00:00 2001 From: Meador Inge Date: Mon, 28 May 2012 13:52:59 -0500 Subject: Issue #9041: raised exception is misleading An issue in ctypes.c_longdouble, ctypes.c_double, and ctypes.c_float that caused an incorrect exception to be returned in the case of overflow has been fixed. --- Lib/ctypes/test/test_numbers.py | 10 ++++++++++ Misc/NEWS | 4 ++++ Modules/_ctypes/cfield.c | 30 +++++------------------------- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/Lib/ctypes/test/test_numbers.py b/Lib/ctypes/test/test_numbers.py index 2267693..7923906 100644 --- a/Lib/ctypes/test/test_numbers.py +++ b/Lib/ctypes/test/test_numbers.py @@ -216,6 +216,16 @@ class NumberTestCase(unittest.TestCase): # probably be changed: self.assertRaises(TypeError, c_int, c_long(42)) + def test_float_overflow(self): + import sys + big_int = int(sys.float_info.max) * 2 + for t in float_types + [c_longdouble]: + self.assertRaises(OverflowError, t, big_int) + if (hasattr(t, "__ctype_be__")): + self.assertRaises(OverflowError, t.__ctype_be__, big_int) + if (hasattr(t, "__ctype_le__")): + self.assertRaises(OverflowError, t.__ctype_le__, big_int) + ## def test_perf(self): ## check_perf() diff --git a/Misc/NEWS b/Misc/NEWS index f8d7884..6a73cca 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -708,6 +708,10 @@ Library Extension Modules ----------------- +- Issue #9041: An issue in ctypes.c_longdouble, ctypes.c_double, and + ctypes.c_float that caused an incorrect exception to be returned in the + case of overflow has been fixed. + - bsddb module: Erratic behaviour of "DBEnv->rep_elect()" because a typo. Possible crash. diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c index c7053ef..1aab202 100644 --- a/Modules/_ctypes/cfield.c +++ b/Modules/_ctypes/cfield.c @@ -1003,12 +1003,8 @@ g_set(void *ptr, PyObject *value, Py_ssize_t size) long double x; x = PyFloat_AsDouble(value); - if (x == -1 && PyErr_Occurred()) { - PyErr_Format(PyExc_TypeError, - " float expected instead of %s instance", - value->ob_type->tp_name); + if (x == -1 && PyErr_Occurred()) return NULL; - } memcpy(ptr, &x, sizeof(long double)); _RET(value); } @@ -1027,12 +1023,8 @@ d_set(void *ptr, PyObject *value, Py_ssize_t size) double x; x = PyFloat_AsDouble(value); - if (x == -1 && PyErr_Occurred()) { - PyErr_Format(PyExc_TypeError, - " float expected instead of %s instance", - value->ob_type->tp_name); + if (x == -1 && PyErr_Occurred()) return NULL; - } memcpy(ptr, &x, sizeof(double)); _RET(value); } @@ -1051,12 +1043,8 @@ d_set_sw(void *ptr, PyObject *value, Py_ssize_t size) double x; x = PyFloat_AsDouble(value); - if (x == -1 && PyErr_Occurred()) { - PyErr_Format(PyExc_TypeError, - " float expected instead of %s instance", - value->ob_type->tp_name); + if (x == -1 && PyErr_Occurred()) return NULL; - } #ifdef WORDS_BIGENDIAN if (_PyFloat_Pack8(x, (unsigned char *)ptr, 1)) return NULL; @@ -1083,12 +1071,8 @@ f_set(void *ptr, PyObject *value, Py_ssize_t size) float x; x = (float)PyFloat_AsDouble(value); - if (x == -1 && PyErr_Occurred()) { - PyErr_Format(PyExc_TypeError, - " float expected instead of %s instance", - value->ob_type->tp_name); + if (x == -1 && PyErr_Occurred()) return NULL; - } memcpy(ptr, &x, sizeof(x)); _RET(value); } @@ -1107,12 +1091,8 @@ f_set_sw(void *ptr, PyObject *value, Py_ssize_t size) float x; x = (float)PyFloat_AsDouble(value); - if (x == -1 && PyErr_Occurred()) { - PyErr_Format(PyExc_TypeError, - " float expected instead of %s instance", - value->ob_type->tp_name); + if (x == -1 && PyErr_Occurred()) return NULL; - } #ifdef WORDS_BIGENDIAN if (_PyFloat_Pack4(x, (unsigned char *)ptr, 1)) return NULL; -- cgit v0.12