mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

(Merge 3.3) Issue #18137: Detect integer overflow on precision in

Browse source 
float.__format__() and complex.__format__().
This commit is contained in:
Victor Stinner 2013-06-23 14:55:43 +02:00
commit 2ab07f01a4
3 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/test/test_format.py
View file

@ -331,6 +331,23 @@ class FormatTest(unittest.TestCase):
def test_main():
support.run_unittest(FormatTest)
def test_precision(self):
INT_MAX = 2147483647
f = 1.2
self.assertEqual(format(f, ".0f"), "1")
self.assertEqual(format(f, ".3f"), "1.200")
with self.assertRaises(ValueError) as cm:
format(f, ".%sf" % (INT_MAX + 1))
self.assertEqual(str(cm.exception), "precision too big")
c = complex(f)
self.assertEqual(format(f, ".0f"), "1")
self.assertEqual(format(f, ".3f"), "1.200")
with self.assertRaises(ValueError) as cm:
format(f, ".%sf" % (INT_MAX + 1))
self.assertEqual(str(cm.exception), "precision too big")
if __name__ == "__main__":
unittest.main()

3
Misc/NEWS
View file

@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins
-----------------
- Issue #18137: Detect integer overflow on precision in float.__format__()
and complex.__format__().
- Issue #15767: Introduce ModuleNotFoundError which is raised when a module
could not be found.

16
Python/formatter_unicode.c
View file

@ -982,7 +982,7 @@ format_float_internal(PyObject *value,
Py_ssize_t n_total;
int has_decimal;
double val;
Py_ssize_t precision = format->precision;
Py_ssize_t precision;
Py_ssize_t default_precision = 6;
Py_UCS4 type = format->type;
int add_pct = 0;
@ -999,6 +999,12 @@ format_float_internal(PyObject *value,
from a hard-code pseudo-locale */
LocaleInfo locale = STATIC_LOCALE_INFO_INIT;
if (format->precision > INT_MAX) {
PyErr_SetString(PyExc_ValueError, "precision too big");
goto done;
}
precision = (int)format->precision;
if (format->alternate)
flags |= Py_DTSF_ALT;
@ -1132,7 +1138,7 @@ format_complex_internal(PyObject *value,
Py_ssize_t n_im_total;
int re_has_decimal;
int im_has_decimal;
Py_ssize_t precision = format->precision;
int precision;
Py_ssize_t default_precision = 6;
Py_UCS4 type = format->type;
Py_ssize_t i_re;
@ -1160,6 +1166,12 @@ format_complex_internal(PyObject *value,
from a hard-code pseudo-locale */
LocaleInfo locale = STATIC_LOCALE_INFO_INIT;
if (format->precision > INT_MAX) {
PyErr_SetString(PyExc_ValueError, "precision too big");
goto done;
}
precision = (int)format->precision;
/* Zero padding is not allowed. */
if (format->fill_char == '0') {
PyErr_SetString(PyExc_ValueError,