From 20d6c153275de051f0800a266d511ea5bef782ce Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 17 Jan 2010 12:43:00 +0000 Subject: Merged revisions 77576 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77576 | antoine.pitrou | 2010-01-17 13:38:54 +0100 (dim., 17 janv. 2010) | 12 lines Merged revisions 77573 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77573 | antoine.pitrou | 2010-01-17 13:26:20 +0100 (dim., 17 janv. 2010) | 6 lines Issue #7561: Operations on empty bytearrays (such as `int(bytearray())`) could crash in many places because of the PyByteArray_AS_STRING() macro returning NULL. The macro now returns a statically allocated empty string instead. ........ ................ --- Lib/test/test_bytes.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Lib/test/test_bytes.py') diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index f2222a1eba..9ccc7874ab 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -811,6 +811,14 @@ class ByteArrayTest(BaseBytesTest): self.assertRaises(BufferError, delslice) self.assertEquals(b, orig) + def test_empty_bytearray(self): + # Issue #7561: operations on empty bytearrays could crash in many + # situations, due to a fragile implementation of the + # PyByteArray_AS_STRING() C macro. + self.assertRaises(ValueError, int, bytearray(b'')) + self.assertRaises((ValueError, OSError), os.mkdir, bytearray(b'')) + + class AssortedBytesTest(unittest.TestCase): # # Test various combinations of bytes and bytearray -- cgit v1.2.1