mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-24 20:30:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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 13:52:59 -05:00
parent d9d276b0dc
commit fe7aa49f24
3 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Modules/_ctypes/cfield.c
View file

@ -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;