Mercurial > cpython-lru_cache-weakref

diff Objects/unicodeobject.c @ 76944:cda2fbbf2a31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Silence VS 2010 signed/unsigned warnings.
author Martin v. Löwis <martin@v.loewis.de>
date Tue, 15 May 2012 13:45:49 +0200
parents 9d9495fabeb9
children cdcc816dea85
line wrap: on
line diff
--- a/Objects/unicodeobject.c	Mon May 14 22:17:34 2012 -0700
+++ b/Objects/unicodeobject.c	Tue May 15 13:45:49 2012 +0200
@@ -13591,7 +13591,10 @@
                     c = PyUnicode_READ(fmtkind, fmt, fmtpos++);
                     if (c < '0' || c > '9')
                         break;
-                    if (width > (PY_SSIZE_T_MAX - (c - '0')) / 10) {
+                    /* Since c is unsigned, the RHS would end up as unsigned,
+                       mixing signed and unsigned comparison. Since c is between
+                       '0' and '9', casting to int is safe. */
+                    if (width > (PY_SSIZE_T_MAX - ((int)c - '0')) / 10) {
                         PyErr_SetString(PyExc_ValueError,
                                         "width too big");
                         goto onError;
@@ -13626,7 +13629,7 @@
                         c = PyUnicode_READ(fmtkind, fmt, fmtpos++);
                         if (c < '0' || c > '9')
                             break;
-                        if (prec > (INT_MAX - (c - '0')) / 10) {
+                        if (prec > (INT_MAX - ((int)c - '0')) / 10) {
                             PyErr_SetString(PyExc_ValueError,
                                             "prec too big");
                             goto onError;