Commit 1532147e authored by Mark Dickinson's avatar Mark Dickinson

Merged revisions 70684 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70684 | mark.dickinson | 2009-03-29 17:24:29 +0100 (Sun, 29 Mar 2009) | 3 lines

  Issue #532631: Apply floatformat changes to unicodeobject.c
  as well as stringobject.c.
........
parent cfe1e494
...@@ -8228,6 +8228,15 @@ formatfloat(Py_UNICODE *buf, ...@@ -8228,6 +8228,15 @@ formatfloat(Py_UNICODE *buf,
return -1; return -1;
if (prec < 0) if (prec < 0)
prec = 6; prec = 6;
/* make sure that the decimal representation of precision really does
need at most 10 digits: platforms with sizeof(int) == 8 exist! */
if (prec > 0x7fffffffL) {
PyErr_SetString(PyExc_OverflowError,
"outrageously large precision "
"for formatted float");
return -1;
}
if (type == 'f' && fabs(x) >= 1e50) if (type == 'f' && fabs(x) >= 1e50)
type = 'g'; type = 'g';
/* Worst case length calc to ensure no buffer overrun: /* Worst case length calc to ensure no buffer overrun:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment