diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-11-09 11:21:09 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-11-09 11:21:09 (GMT) |
| commit | e192d0bbb969bcefe4658daddd9e495153fadad5 (patch) | |
| tree | 830b284ff305b9ffd984c5c682dca8c7b7860fde /Objects/stringlib/formatter.h | |
| parent | 8d0a94df33a356a67d72c85ebf1aebb641e94e45 (diff) | |
| download | cpython-e192d0bbb969bcefe4658daddd9e495153fadad5.zip cpython-e192d0bbb969bcefe4658daddd9e495153fadad5.tar.gz cpython-e192d0bbb969bcefe4658daddd9e495153fadad5.tar.bz2 | |
Issue #7267: format(int, 'c') now raises OverflowError when the argument is not
in range(0, 256).
Diffstat (limited to 'Objects/stringlib/formatter.h')
| -rw-r--r-- | Objects/stringlib/formatter.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h index 122abe6..b75755e 100644 --- a/Objects/stringlib/formatter.h +++ b/Objects/stringlib/formatter.h @@ -789,6 +789,7 @@ format_int_or_long_internal(PyObject *value, const InternalFormatSpec *format, x = PyLong_AsLong(value); if (x == -1 && PyErr_Occurred()) goto done; +#if STRINGLIB_IS_UNICODE #ifdef Py_UNICODE_WIDE if (x < 0 || x > 0x10ffff) { PyErr_SetString(PyExc_OverflowError, @@ -804,6 +805,13 @@ format_int_or_long_internal(PyObject *value, const InternalFormatSpec *format, goto done; } #endif +#else + if (x < 0 || x > 0xff) { + PyErr_SetString(PyExc_OverflowError, + "%c arg not in range(0x100)"); + goto done; + } +#endif numeric_char = (STRINGLIB_CHAR)x; pnumeric_chars = &numeric_char; n_digits = 1; |