summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-02-26 00:27:38 +0100
committerVictor Stinner <victor.stinner@gmail.com>2013-02-26 00:27:38 +0100
commit29ec595c6a705428784d24eb7e03681637c4eb03 (patch)
treed63517b2a435e09cbdf6126c6509b5a74a1cea06
parentd21b58c05d5e187bb736dc913da6ddefd9c9d8b3 (diff)
downloadcpython-git-29ec595c6a705428784d24eb7e03681637c4eb03.tar.gz
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.
-rwxr-xr-xLib/test/test_array.py6
-rw-r--r--Misc/NEWS4
-rw-r--r--Modules/arraymodule.c2
3 files changed, 12 insertions, 0 deletions
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
index a532a9fd2b..bfef4fac5a 100755
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -1069,6 +1069,12 @@ class UnicodeTest(StringTest, unittest.TestCase):
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 40c4825792..89cbcb59e1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 3.3.1?
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 adc4d5d865..96c9e5bba7 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -2180,6 +2180,8 @@ array_repr(arrayobject *a)
} else {
v = array_tolist(a, NULL);
}
+ if (v == NULL)
+ return NULL;
s = PyUnicode_FromFormat("array('%c', %R)", (int)typecode, v);
Py_DECREF(v);