mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-25 10:54:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #9041: raised exception is misleading

Browse Source 
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.
This commit is contained in:
Meador Inge 2012-05-28 14:21:16 -05:00
parent 4b6045c30f
commit 031e25b0f7
3 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/ctypes/test/test_numbers.py
View File

@ -217,6 +217,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()

4
Misc/NEWS
View File

@ -262,6 +262,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.
- Issue #14212: The re module didn't retain a reference to buffers it was
scanning, resulting in segfaults.

30
Modules/_ctypes/cfield.c
View File

@ -1002,12 +1002,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);
}
@ -1026,12 +1022,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);
}
@ -1050,12 +1042,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;
@ -1082,12 +1070,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);
}
@ -1106,12 +1090,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;