Issue #17223: array module: Fix a crasher when converting an array containing
invalid characters (outside range [U+0000; U+10ffff]) to Unicode: repr(array),
str(array) and array.tounicode(). Patch written by Manuel Jacob.
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
index a532a9f..bfef4fa 100755
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -1069,6 +1069,12 @@
self.assertRaises(TypeError, a.fromunicode)
+ def test_issue17223(self):
+ # this used to crash
+ a = array.array('u', b'\xff' * 4)
+ self.assertRaises(ValueError, a.tounicode)
+ self.assertRaises(ValueError, str, a)
+
class NumberTest(BaseTest):
def test_extslice(self):
diff --git a/Misc/NEWS b/Misc/NEWS
index 40c4825..89cbcb5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@
Core and Builtins
-----------------
+- Issue #17223: array module: Fix a crasher when converting an array containing
+ invalid characters (outside range [U+0000; U+10ffff]) to Unicode:
+ repr(array), str(array) and array.tounicode(). Patch written by Manuel Jacob.
+
- Issue #17223: Fix PyUnicode_FromUnicode() for string of 1 character outside
the range U+0000-U+10ffff.
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index adc4d5d..96c9e5b 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -2180,6 +2180,8 @@
} else {
v = array_tolist(a, NULL);
}
+ if (v == NULL)
+ return NULL;
s = PyUnicode_FromFormat("array('%c', %R)", (int)typecode, v);
Py_DECREF(v);