mirror of
https://github.com/python/cpython.git
synced 2024-11-23 18:04:37 +08:00
bpo-45034: Fix how upper limit is formatted for struct.pack("H", ...)
(GH-28178)
Co-authored-by: Mark Dickinson <dickinsm@gmail.com> Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
parent
97b754d4b4
commit
8ca6b61e3f
@ -678,6 +678,24 @@ class StructTest(unittest.TestCase):
|
||||
'embedded null character'):
|
||||
struct.calcsize(s)
|
||||
|
||||
@support.cpython_only
|
||||
def test_issue45034_unsigned(self):
|
||||
from _testcapi import USHRT_MAX
|
||||
error_msg = f'ushort format requires 0 <= number <= {USHRT_MAX}'
|
||||
with self.assertRaisesRegex(struct.error, error_msg):
|
||||
struct.pack('H', 70000) # too large
|
||||
with self.assertRaisesRegex(struct.error, error_msg):
|
||||
struct.pack('H', -1) # too small
|
||||
|
||||
@support.cpython_only
|
||||
def test_issue45034_signed(self):
|
||||
from _testcapi import SHRT_MIN, SHRT_MAX
|
||||
error_msg = f'short format requires {SHRT_MIN} <= number <= {SHRT_MAX}'
|
||||
with self.assertRaisesRegex(struct.error, error_msg):
|
||||
struct.pack('h', 70000) # too large
|
||||
with self.assertRaisesRegex(struct.error, error_msg):
|
||||
struct.pack('h', -70000) # too small
|
||||
|
||||
|
||||
class UnpackIteratorTest(unittest.TestCase):
|
||||
"""
|
||||
|
@ -1663,6 +1663,7 @@ Ryan Smith-Roberts
|
||||
Rafal Smotrzyk
|
||||
Josh Snider
|
||||
Eric Snow
|
||||
Nikita Sobolev
|
||||
Dirk Soede
|
||||
Nir Soffer
|
||||
Paul Sokolovsky
|
||||
|
@ -0,0 +1,2 @@
|
||||
Changes how error is formatted for ``struct.pack`` with ``'H'`` and ``'h'`` modes and
|
||||
too large / small numbers. Now it shows the actual numeric limits, while previously it was showing arithmetic expressions.
|
@ -589,9 +589,9 @@ np_short(_structmodulestate *state, char *p, PyObject *v, const formatdef *f)
|
||||
if (get_long(state, v, &x) < 0)
|
||||
return -1;
|
||||
if (x < SHRT_MIN || x > SHRT_MAX) {
|
||||
PyErr_SetString(state->StructError,
|
||||
"short format requires " Py_STRINGIFY(SHRT_MIN)
|
||||
" <= number <= " Py_STRINGIFY(SHRT_MAX));
|
||||
PyErr_Format(state->StructError,
|
||||
"short format requires %d <= number <= %d",
|
||||
(int)SHRT_MIN, (int)SHRT_MAX);
|
||||
return -1;
|
||||
}
|
||||
y = (short)x;
|
||||
@ -607,9 +607,9 @@ np_ushort(_structmodulestate *state, char *p, PyObject *v, const formatdef *f)
|
||||
if (get_long(state, v, &x) < 0)
|
||||
return -1;
|
||||
if (x < 0 || x > USHRT_MAX) {
|
||||
PyErr_SetString(state->StructError,
|
||||
"ushort format requires 0 <= number <= "
|
||||
Py_STRINGIFY(USHRT_MAX));
|
||||
PyErr_Format(state->StructError,
|
||||
"ushort format requires 0 <= number <= %u",
|
||||
(unsigned int)USHRT_MAX);
|
||||
return -1;
|
||||
}
|
||||
y = (unsigned short)x;
|
||||
|
Loading…
Reference in New Issue
Block a user