diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2012-05-15 11:45:49 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2012-05-15 11:45:49 (GMT) |
| commit | b05c0738d81299dab0bd9f0cc4bae21bc2f80045 (patch) | |
| tree | a82e43a000eff79e80e2cb8ac6c80e918298c3fd /Objects/unicodeobject.c | |
| parent | 6ecf8ce36475d60efe523c0160e021afced8a636 (diff) | |
| download | cpython-b05c0738d81299dab0bd9f0cc4bae21bc2f80045.zip cpython-b05c0738d81299dab0bd9f0cc4bae21bc2f80045.tar.gz cpython-b05c0738d81299dab0bd9f0cc4bae21bc2f80045.tar.bz2 | |
Silence VS 2010 signed/unsigned warnings.
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 4a1cce2..2e1e0bd 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -13591,7 +13591,10 @@ PyUnicode_Format(PyObject *format, PyObject *args) 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 @@ PyUnicode_Format(PyObject *format, PyObject *args) 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; |