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.
This commit is contained in:
parent
d9d276b0dc
commit
fe7aa49f24
|
@ -216,6 +216,16 @@ class NumberTestCase(unittest.TestCase):
|
||||||
# probably be changed:
|
# probably be changed:
|
||||||
self.assertRaises(TypeError, c_int, c_long(42))
|
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):
|
## def test_perf(self):
|
||||||
## check_perf()
|
## check_perf()
|
||||||
|
|
||||||
|
|
|
@ -708,6 +708,10 @@ Library
|
||||||
Extension Modules
|
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.
|
- bsddb module: Erratic behaviour of "DBEnv->rep_elect()" because a typo.
|
||||||
Possible crash.
|
Possible crash.
|
||||||
|
|
||||||
|
|
|
@ -1003,12 +1003,8 @@ g_set(void *ptr, PyObject *value, Py_ssize_t size)
|
||||||
long double x;
|
long double x;
|
||||||
|
|
||||||
x = PyFloat_AsDouble(value);
|
x = PyFloat_AsDouble(value);
|
||||||
if (x == -1 && PyErr_Occurred()) {
|
if (x == -1 && PyErr_Occurred())
|
||||||
PyErr_Format(PyExc_TypeError,
|
|
||||||
" float expected instead of %s instance",
|
|
||||||
value->ob_type->tp_name);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
|
||||||
memcpy(ptr, &x, sizeof(long double));
|
memcpy(ptr, &x, sizeof(long double));
|
||||||
_RET(value);
|
_RET(value);
|
||||||
}
|
}
|
||||||
|
@ -1027,12 +1023,8 @@ d_set(void *ptr, PyObject *value, Py_ssize_t size)
|
||||||
double x;
|
double x;
|
||||||
|
|
||||||
x = PyFloat_AsDouble(value);
|
x = PyFloat_AsDouble(value);
|
||||||
if (x == -1 && PyErr_Occurred()) {
|
if (x == -1 && PyErr_Occurred())
|
||||||
PyErr_Format(PyExc_TypeError,
|
|
||||||
" float expected instead of %s instance",
|
|
||||||
value->ob_type->tp_name);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
|
||||||
memcpy(ptr, &x, sizeof(double));
|
memcpy(ptr, &x, sizeof(double));
|
||||||
_RET(value);
|
_RET(value);
|
||||||
}
|
}
|
||||||
|
@ -1051,12 +1043,8 @@ d_set_sw(void *ptr, PyObject *value, Py_ssize_t size)
|
||||||
double x;
|
double x;
|
||||||
|
|
||||||
x = PyFloat_AsDouble(value);
|
x = PyFloat_AsDouble(value);
|
||||||
if (x == -1 && PyErr_Occurred()) {
|
if (x == -1 && PyErr_Occurred())
|
||||||
PyErr_Format(PyExc_TypeError,
|
|
||||||
" float expected instead of %s instance",
|
|
||||||
value->ob_type->tp_name);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
|
||||||
#ifdef WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
if (_PyFloat_Pack8(x, (unsigned char *)ptr, 1))
|
if (_PyFloat_Pack8(x, (unsigned char *)ptr, 1))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -1083,12 +1071,8 @@ f_set(void *ptr, PyObject *value, Py_ssize_t size)
|
||||||
float x;
|
float x;
|
||||||
|
|
||||||
x = (float)PyFloat_AsDouble(value);
|
x = (float)PyFloat_AsDouble(value);
|
||||||
if (x == -1 && PyErr_Occurred()) {
|
if (x == -1 && PyErr_Occurred())
|
||||||
PyErr_Format(PyExc_TypeError,
|
|
||||||
" float expected instead of %s instance",
|
|
||||||
value->ob_type->tp_name);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
|
||||||
memcpy(ptr, &x, sizeof(x));
|
memcpy(ptr, &x, sizeof(x));
|
||||||
_RET(value);
|
_RET(value);
|
||||||
}
|
}
|
||||||
|
@ -1107,12 +1091,8 @@ f_set_sw(void *ptr, PyObject *value, Py_ssize_t size)
|
||||||
float x;
|
float x;
|
||||||
|
|
||||||
x = (float)PyFloat_AsDouble(value);
|
x = (float)PyFloat_AsDouble(value);
|
||||||
if (x == -1 && PyErr_Occurred()) {
|
if (x == -1 && PyErr_Occurred())
|
||||||
PyErr_Format(PyExc_TypeError,
|
|
||||||
" float expected instead of %s instance",
|
|
||||||
value->ob_type->tp_name);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
|
||||||
#ifdef WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
if (_PyFloat_Pack4(x, (unsigned char *)ptr, 1))
|
if (_PyFloat_Pack4(x, (unsigned char *)ptr, 1))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Reference in New Issue