mirror of
https://github.com/python/cpython.git
synced 2025-07-31 23:23:11 +00:00
Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently
across platforms: it should now raise OverflowError on all platforms. (Previously it raised OverflowError only on non IEEE 754 platforms.) Also fix the (already existing) test for this behaviour so that it actually raises TestFailed instead of just referencing it.
This commit is contained in:
parent
6119540d70
commit
c23b8a7af9
3 changed files with 13 additions and 9 deletions
|
@ -1751,9 +1751,6 @@ PyFloat_Fini(void)
|
|||
|
||||
/*----------------------------------------------------------------------------
|
||||
* _PyFloat_{Pack,Unpack}{4,8}. See floatobject.h.
|
||||
*
|
||||
* TODO: On platforms that use the standard IEEE-754 single and double
|
||||
* formats natively, these routines could simply copy the bytes.
|
||||
*/
|
||||
int
|
||||
_PyFloat_Pack4(double x, unsigned char *p, int le)
|
||||
|
@ -1833,28 +1830,31 @@ _PyFloat_Pack4(double x, unsigned char *p, int le)
|
|||
/* Done */
|
||||
return 0;
|
||||
|
||||
Overflow:
|
||||
PyErr_SetString(PyExc_OverflowError,
|
||||
"float too large to pack with f format");
|
||||
return -1;
|
||||
}
|
||||
else {
|
||||
float y = (float)x;
|
||||
const char *s = (char*)&y;
|
||||
int i, incr = 1;
|
||||
|
||||
if (Py_IS_INFINITY(y) && !Py_IS_INFINITY(x))
|
||||
goto Overflow;
|
||||
|
||||
if ((float_format == ieee_little_endian_format && !le)
|
||||
|| (float_format == ieee_big_endian_format && le)) {
|
||||
p += 3;
|
||||
incr = -1;
|
||||
}
|
||||
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
*p = *s++;
|
||||
p += incr;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
Overflow:
|
||||
PyErr_SetString(PyExc_OverflowError,
|
||||
"float too large to pack with f format");
|
||||
return -1;
|
||||
}
|
||||
|
||||
int
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue