mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-28 20:56:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Backed out r65073, pending fixing it in Windows.

Browse source
This commit is contained in:
Eric Smith 2008-07-17 19:18:29 +00:00
parent a4fac36eb3
commit 22b85b3ef8
7 changed files with 18 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Objects/unicodeobject.c
View file

@ -8588,12 +8588,8 @@ formatfloat(Py_UNICODE *buf,
return -1;
if (prec < 0)
prec = 6;
if ((type == 'f' || type == 'F') && (fabs(x) / 1e25) >= 1e25) {
if (type == 'f')
type = 'g';
else
type = 'G';
}
if (type == 'f' && (fabs(x) / 1e25) >= 1e25)
type = 'g';
/* Worst case length calc to ensure no buffer overrun:
'g' formats:
@ -8612,8 +8608,7 @@ formatfloat(Py_UNICODE *buf,
*/
if (((type == 'g' || type == 'G') &&
buflen <= (size_t)10 + (size_t)prec) ||
((type == 'f' || type == 'F') &&
buflen <= (size_t)53 + (size_t)prec)) {
(type == 'f' && buflen <= (size_t)53 + (size_t)prec)) {
PyErr_SetString(PyExc_OverflowError,
"formatted float is too long (precision too large?)");
return -1;
@ -9096,6 +9091,8 @@ PyObject *PyUnicode_Format(PyObject *format,
case 'F':
case 'g':
case 'G':
if (c == 'F')
c = 'f';
pbuf = formatbuf;
len = formatfloat(pbuf, sizeof(formatbuf)/sizeof(Py_UNICODE),
flags, prec, c, v);