summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-06-29 18:18:01 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-06-29 18:18:01 (GMT)
commitbc9e75ed023ff03f555682e57d25fee32e6548a0 (patch)
tree5f31459160ab9cae7a005ce01766d834f321e26d /Lib
parenta95a476b3ae93d890209e592d675ae64c82e05dc (diff)
parent7b6e3b91f54e8fafbb1565a7d0999dec4fca783f (diff)
downloadcpython-bc9e75ed023ff03f555682e57d25fee32e6548a0.zip
cpython-bc9e75ed023ff03f555682e57d25fee32e6548a0.tar.gz
cpython-bc9e75ed023ff03f555682e57d25fee32e6548a0.tar.bz2
Issue #24467: Fixed possible buffer over-read in bytearray. The bytearray
object now always allocates place for trailing null byte and it's buffer now is always null-terminated.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_bytes.py19
1 files changed, 18 insertions, 1 deletions
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 7ff7f19..53a80f4 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -1098,10 +1098,27 @@ class ByteArrayTest(BaseBytesTest, unittest.TestCase):
for i in range(100):
b += b"x"
alloc = b.__alloc__()
- self.assertTrue(alloc >= len(b))
+ self.assertGreater(alloc, len(b)) # including trailing null byte
if alloc not in seq:
seq.append(alloc)
+ def test_init_alloc(self):
+ b = bytearray()
+ def g():
+ for i in range(1, 100):
+ yield i
+ a = list(b)
+ self.assertEqual(a, list(range(1, len(a)+1)))
+ self.assertEqual(len(b), len(a))
+ self.assertLessEqual(len(b), i)
+ alloc = b.__alloc__()
+ self.assertGreater(alloc, len(b)) # including trailing null byte
+ b.__init__(g())
+ self.assertEqual(list(b), list(range(1, 100)))
+ self.assertEqual(len(b), 99)
+ alloc = b.__alloc__()
+ self.assertGreater(alloc, len(b))
+
def test_extend(self):
orig = b'hello'
a = bytearray(orig)