bpo-44458: Ensure BUFFER_BLOCK_SIZE symbol is statically allocated. (GH-26808)

* bpo-44458: Ensure BUFFER_BLOCK_SIZE symbol is statically allocated.
This commit is contained in:
Russell Keith-Magee 2021-06-22 14:36:36 +08:00 committed by GitHub
parent be1cb3214d
commit 92c2e91580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View File

@ -57,7 +57,7 @@ static const char unable_allocate_msg[] = "Unable to allocate output buffer.";
/* Block size sequence */ /* Block size sequence */
#define KB (1024) #define KB (1024)
#define MB (1024*1024) #define MB (1024*1024)
const Py_ssize_t BUFFER_BLOCK_SIZE[] = static const Py_ssize_t BUFFER_BLOCK_SIZE[] =
{ 32*KB, 64*KB, 256*KB, 1*MB, 4*MB, 8*MB, 16*MB, 16*MB, { 32*KB, 64*KB, 256*KB, 1*MB, 4*MB, 8*MB, 16*MB, 16*MB,
32*MB, 32*MB, 32*MB, 32*MB, 64*MB, 64*MB, 128*MB, 128*MB, 32*MB, 32*MB, 32*MB, 32*MB, 64*MB, 64*MB, 128*MB, 128*MB,
OUTPUT_BUFFER_MAX_BLOCK_SIZE }; OUTPUT_BUFFER_MAX_BLOCK_SIZE };

View File

@ -0,0 +1 @@
``BUFFER_BLOCK_SIZE`` is now declared static, to avoid linking collisions when bz2, lmza or zlib are statically linked.