changeset:   96719:942860bada14
branch:      3.5
parent:      96713:98380a6e037c
parent:      96718:c95d7ffa492e
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Mon Jun 29 21:18:01 2015 +0300
files:       Lib/test/test_bytes.py Misc/NEWS Objects/bytearrayobject.c Objects/clinic/bytearrayobject.c.h
description:
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.


diff -r 98380a6e037c -r 942860bada14 Lib/test/test_bytes.py
--- a/Lib/test/test_bytes.py	Sun Jun 28 11:13:30 2015 -0400
+++ b/Lib/test/test_bytes.py	Mon Jun 29 21:18:01 2015 +0300
@@ -1098,10 +1098,27 @@
         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)
diff -r 98380a6e037c -r 942860bada14 Misc/NEWS
--- a/Misc/NEWS	Sun Jun 28 11:13:30 2015 -0400
+++ b/Misc/NEWS	Mon Jun 29 21:18:01 2015 +0300
@@ -10,6 +10,10 @@
 Core and Builtins
 -----------------
 
+- 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.
+
 - Upgrade to Unicode 8.0.0.
 
 - Issue #24345: Add Py_tp_finalize slot for the stable ABI.
diff -r 98380a6e037c -r 942860bada14 Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c	Sun Jun 28 11:13:30 2015 -0400
+++ b/Objects/bytearrayobject.c	Mon Jun 29 21:18:01 2015 +0300
@@ -891,8 +891,10 @@
             goto error;
 
         /* Append the byte */
-        if (Py_SIZE(self) < self->ob_alloc)
+        if (Py_SIZE(self) + 1 < self->ob_alloc) {
             Py_SIZE(self)++;
+            PyByteArray_AS_STRING(self)[Py_SIZE(self)] = '\0';
+        }
         else if (PyByteArray_Resize((PyObject *)self, Py_SIZE(self)+1) < 0)
             goto error;
         PyByteArray_AS_STRING(self)[Py_SIZE(self)-1] = value;