[Python-checkins] cpython (3.3): Issue #18137: Detect integer overflow on precision in float.format() and

Sun Jun 23 14:57:36 CEST 2013

http://hg.python.org/cpython/rev/ef5175d08e7e
changeset: 84266:ef5175d08e7e
branch: 3.3
parent: 84263:7ecca1a98220
user: Victor Stinner <victor.stinner at gmail.com>
date: Sun Jun 23 14:54:30 2013 +0200
summary:
 Issue #18137: Detect integer overflow on precision in float.__format__() and
complex.__format__().
files:
 Lib/test/test_format.py | 17 +++++++++++++++++
 Misc/NEWS | 3 +++
 Python/formatter_unicode.c | 16 ++++++++++++++--
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py
--- a/Lib/test/test_format.py
+++ b/Lib/test/test_format.py
@@ -312,6 +312,23 @@
 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()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #18137: Detect integer overflow on precision in float.__format__()
+ and complex.__format__().
+
 - Issue #18183: Fix various unicode operations on strings with large unicode
 codepoints.
 
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -977,7 +977,7 @@
 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;
@@ -994,6 +994,12 @@
 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;
 
@@ -1127,7 +1133,7 @@
 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;
@@ -1155,6 +1161,12 @@
 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,
-- 
Repository URL: http://hg.python.org/cpython


[Python-checkins] cpython (3.3): Issue #18137: Detect integer overflow on precision in float.__format__() and

[Python-checkins] cpython (3.3): Issue #18137: Detect integer overflow on precision in float.format() and