diff options
| -rw-r--r-- | Lib/test/test_format.py | 12 | ||||
| -rw-r--r-- | Objects/bytesobject.c | 11 |
2 files changed, 14 insertions, 9 deletions
diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py index 5a2a357..2dad958 100644 --- a/Lib/test/test_format.py +++ b/Lib/test/test_format.py @@ -358,12 +358,12 @@ class FormatTest(unittest.TestCase): "not all arguments converted during bytes formatting") test_exc(b'no format', bytearray(b'1'), TypeError, "not all arguments converted during bytes formatting") - test_exc(b"%c", -1, TypeError, - "%c requires an integer in range(256) or a single byte") - test_exc(b"%c", 256, TypeError, - "%c requires an integer in range(256) or a single byte") - test_exc(b"%c", 2**128, TypeError, - "%c requires an integer in range(256) or a single byte") + test_exc(b"%c", -1, OverflowError, + "%c arg not in range(256)") + test_exc(b"%c", 256, OverflowError, + "%c arg not in range(256)") + test_exc(b"%c", 2**128, OverflowError, + "%c arg not in range(256)") test_exc(b"%c", b"Za", TypeError, "%c requires an integer in range(256) or a single byte") test_exc(b"%c", "Y", TypeError, diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 5a2d41c..27d6472 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -496,10 +496,15 @@ byte_converter(PyObject *arg, char *p) ival = PyLong_AsLongAndOverflow(iobj, &overflow); Py_DECREF(iobj); } - if (!overflow && 0 <= ival && ival <= 255) { - *p = (char)ival; - return 1; + if (!overflow && ival == -1 && PyErr_Occurred()) + goto onError; + if (overflow || !(0 <= ival && ival <= 255)) { + PyErr_SetString(PyExc_OverflowError, + "%c arg not in range(256)"); + return 0; } + *p = (char)ival; + return 1; } onError: PyErr_SetString(PyExc_TypeError, |