mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-41175: Guard against a NULL pointer dereference within bytearrayobject (GH-21240)

Browse source 
The issue is triggered by the bytearray() + bytearray() operation.

Detected by GCC 10 static analysis tool.
This commit is contained in:
stratakis 2020-07-08 22:39:41 +02:00 • committed by GitHub
parent 529f42645d
commit 61fc23ca10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Core and Builtins/2020-06-30-20-17-31.bpo-41175.acJoXB.rst Normal file
View file

@ -0,0 +1,2 @@
Guard against a NULL pointer dereference within bytearrayobject triggered by
the ``bytearray() + bytearray()`` operation.

4
Objects/bytearrayobject.c
View file

@ -266,7 +266,9 @@ PyByteArray_Concat(PyObject *a, PyObject *b)
result = (PyByteArrayObject *) \ result = (PyByteArrayObject *) \
PyByteArray_FromStringAndSize(NULL, va.len + vb.len); PyByteArray_FromStringAndSize(NULL, va.len + vb.len);
if (result != NULL) { // result->ob_bytes is NULL if result is an empty string:
// if va.len + vb.len equals zero.
if (result != NULL && result->ob_bytes != NULL) {
memcpy(result->ob_bytes, va.buf, va.len); memcpy(result->ob_bytes, va.buf, va.len);
memcpy(result->ob_bytes + va.len, vb.buf, vb.len); memcpy(result->ob_bytes + va.len, vb.buf, vb.len);
} }