mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-42924: Fix incorrect copy in bytearray_repeat (GH-24208)

Browse source 
Before, using the * operator to repeat a bytearray would copy data from the start of
the internal buffer (ob_bytes) and not from the start of the actual data (ob_start).
This commit is contained in:
Tobias Holl 2021-01-13 17:16:40 +01:00 • committed by GitHub
parent 1659ad1c64
commit 61d8c54f43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_bytes.py
View file

@ -1666,6 +1666,16 @@ class ByteArrayTest(BaseBytesTest, unittest.TestCase):
# Shouldn't raise an error
self.assertEqual(list(it), [])
def test_repeat_after_setslice(self):
# bpo-42924: * used to copy from the wrong memory location
b = bytearray(b'abc')
b[:2] = b'x'
b1 = b * 1
b3 = b * 3
self.assertEqual(b1, b'xc')
self.assertEqual(b1, b)
self.assertEqual(b3, b'xcxcxc')
class AssortedBytesTest(unittest.TestCase):
#

1
Misc/NEWS.d/next/Core and Builtins/2021-01-13-14-06-01.bpo-42924._WS1Ok.rst Normal file
View file

@ -0,0 +1 @@
Fix ``bytearray`` repetition incorrectly copying data from the start of the buffer, even if the data is offset within the buffer (e.g. after reassigning a slice at the start of the ``bytearray`` to a shorter byte string).

6
Objects/bytearrayobject.c
View file

@ -321,6 +321,7 @@ bytearray_repeat(PyByteArrayObject *self, Py_ssize_t count)
PyByteArrayObject *result;
Py_ssize_t mysize;
Py_ssize_t size;
const char *buf;
if (count < 0)
count = 0;
@ -329,13 +330,14 @@ bytearray_repeat(PyByteArrayObject *self, Py_ssize_t count)
return PyErr_NoMemory();
size = mysize * count;
result = (PyByteArrayObject *)PyByteArray_FromStringAndSize(NULL, size);
buf = PyByteArray_AS_STRING(self);
if (result != NULL && size != 0) {
if (mysize == 1)
memset(result->ob_bytes, self->ob_bytes[0], size);
memset(result->ob_bytes, buf[0], size);
else {
Py_ssize_t i;
for (i = 0; i < count; i++)
memcpy(result->ob_bytes + i*mysize, self->ob_bytes, mysize);
memcpy(result->ob_bytes + i*mysize, buf, mysize);
}
}
return (PyObject *)result;