Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Silence VS 2010 signed/unsigned warnings.

This commit is contained in:
Martin v. Löwis 2012-05-15 13:45:49 +02:00
parent 6ecf8ce364
commit b05c0738d8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Objects/unicodeobject.c
View File

@ -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;