Skip to content

bpo-45034: Fixes how upper limit is formatted for struct.pack("H", ...) #28178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdickinson merged 6 commits into from
Sep 7, 2021
Merged

bpo-45034: Fixes how upper limit is formatted for struct.pack("H", ...) #28178

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a96a7b
bpo-45034: Fixes how upper limit is formatted for `struct.pack("H", .…
sobolevn Sep 5, 2021
fba681c
Update Modules/_struct.c
sobolevn Sep 6, 2021
9f285bb
Update Modules/_struct.c
sobolevn Sep 6, 2021
3df6652
Fixes `np_short` error message
sobolevn Sep 6, 2021
3f8cf50
Adds "Nikita Sobolev" to `Misc/ACKS`
sobolevn Sep 7, 2021
c57e30c
Update Modules/_struct.c
sobolevn Sep 7, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Lib/test/test_struct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,24 @@ def test_issue35714(self):
'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):
"""
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2021-09-05-20-33-25.bpo-45034.62NLD5.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
13 changes: 7 additions & 6 deletions Modules/_struct.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,9 +589,10 @@ 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",
SHRT_MIN,
SHRT_MAX);
return -1;
}
y = (short)x;
Expand All @@ -607,9 +608,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;
Expand Down