Skip to content

gh-155850: Fix array unpickling of odd-length 'w' arrays across endianness #155851

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

Open
tonghuaroot wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −12
Open

gh-155850: Fix array unpickling of odd-length 'w' arrays across endianness #155851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8a9982
gh-155850: Fix array unpickling of odd-length 'w' arrays across endia…
tonghuaroot Aug 15, 2026
73d3aa2
Trim the regression test comment
tonghuaroot Aug 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions Lib/test/test_array.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,20 +254,24 @@ def test_float16_endianness(self):
self.assertEqual(b_be.tolist(), [1.5])

def test_unicode(self):
teststr = "Bonne Journ\xe9e \U0002030a\U00020347"
testcases = (
(UTF16_LE, "UTF-16-LE"),
(UTF16_BE, "UTF-16-BE"),
(UTF32_LE, "UTF-32-LE"),
(UTF32_BE, "UTF-32-BE")
)
for testcase in testcases:
mformat_code, encoding = testcase
a = array.array('w', teststr)
b = array_reconstructor(
array.array, 'w', mformat_code, teststr.encode(encoding))
self.assertEqual(a, b,
msg="{0!r} != {1!r}; testcase={2!r}".format(a, b, testcase))
# An even and an odd length; odd lengths were wrongly rejected.
for teststr in ("Bonne Journ\xe9e \U0002030a\U00020347",
"Bonne Journ\xe9e \U0002030a\U00020347!"):
for testcase in testcases:
mformat_code, encoding = testcase
a = array.array('w', teststr)
b = array_reconstructor(
array.array, 'w', mformat_code, teststr.encode(encoding))
self.assertEqual(
a, b,
msg="{0!r} != {1!r}; testcase={2!r}".format(
a, b, testcase))


class BaseTest:
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2026-08-15-15-00-00.gh-issue-155850.ArrUtf.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix :mod:`array` unpickling of an odd-length ``'w'`` array pickled on a
machine of the opposite endianness; a wrong item size for the UTF-16 and
UTF-32 machine formats made it raise :exc:`ValueError`.
8 changes: 4 additions & 4 deletions Modules/arraymodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2050,10 +2050,10 @@ static const struct mformatdescr {
{4, 0, 1}, /* 15: IEEE_754_FLOAT_BE */
{8, 0, 0}, /* 16: IEEE_754_DOUBLE_LE */
{8, 0, 1}, /* 17: IEEE_754_DOUBLE_BE */
{4, 0, 0}, /* 18: UTF16_LE */
{4, 0, 1}, /* 19: UTF16_BE */
{8, 0, 0}, /* 20: UTF32_LE */
{8, 0, 1}, /* 21: UTF32_BE */
{2, 0, 0}, /* 18: UTF16_LE */
{2, 0, 1}, /* 19: UTF16_BE */
{4, 0, 0}, /* 20: UTF32_LE */
{4, 0, 1}, /* 21: UTF32_BE */
{8, 0, 0}, /* 22: IEEE_754_FLOAT_COMPLEX_LE */
{8, 0, 1}, /* 23: IEEE_754_FLOAT_COMPLEX_BE */
{16, 0, 0}, /* 24: IEEE_754_DOUBLE_COMPLEX_LE */
Expand Down
Loading