commit fb90c0934c22041cad1fc4019c9853205befc967
author Mark Dickinson <mdickinson@enthought.com> Sun Oct 28 10:18:03 2012 +0000
committer Mark Dickinson <mdickinson@enthought.com> Sun Oct 28 10:18:03 2012 +0000
tree 8814d98ae8a6cc931232a07790c55c40072aaccb
parent 579d5cd643d31b732e6e7707582276565e44ece9

Issue #14700: Fix buggy overflow checks for large precision and width in new-style and old-style formatting.

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 1dd3a85..3ef9c9b 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9648,7 +9648,7 @@
                     c = *fmt++;
                     if (c < '0' || c > '9')
                         break;
-                    if ((width*10) / 10 != width) {
+                    if (width > (PY_SSIZE_T_MAX - ((int)c - '0')) / 10) {
                         PyErr_SetString(PyExc_ValueError,
                                         "width too big");
                         goto onError;
@@ -9683,7 +9683,7 @@
                         c = *fmt++;
                         if (c < '0' || c > '9')
                             break;
-                        if ((prec*10) / 10 != prec) {
+                        if (prec > (INT_MAX - ((int)c - '0')) / 10) {
                             PyErr_SetString(PyExc_ValueError,
                                             "prec too big");
                             goto onError;