diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2021-06-22 06:36:36 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 06:36:36 (GMT) |
| commit | 92c2e91580521ba5c85aa3205a0211df5b48689b (patch) | |
| tree | 535baf0417f6da317d16bdd98cd4f79ae83a2d38 | |
| parent | be1cb3214d09d4bf0288bc45f3c1f167f67e4514 (diff) | |
| download | cpython-92c2e91580521ba5c85aa3205a0211df5b48689b.zip cpython-92c2e91580521ba5c85aa3205a0211df5b48689b.tar.gz cpython-92c2e91580521ba5c85aa3205a0211df5b48689b.tar.bz2 | |
bpo-44458: Ensure BUFFER_BLOCK_SIZE symbol is statically allocated. (GH-26808)
* bpo-44458: Ensure BUFFER_BLOCK_SIZE symbol is statically allocated.
| -rw-r--r-- | Include/internal/pycore_blocks_output_buffer.h | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2021-06-20-07-14-46.bpo-44458.myqCQ0.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Include/internal/pycore_blocks_output_buffer.h b/Include/internal/pycore_blocks_output_buffer.h index 22546e9..28cf6fb 100644 --- a/Include/internal/pycore_blocks_output_buffer.h +++ b/Include/internal/pycore_blocks_output_buffer.h @@ -57,7 +57,7 @@ static const char unable_allocate_msg[] = "Unable to allocate output buffer."; /* Block size sequence */ #define KB (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*MB, 32*MB, 32*MB, 32*MB, 64*MB, 64*MB, 128*MB, 128*MB, OUTPUT_BUFFER_MAX_BLOCK_SIZE }; diff --git a/Misc/NEWS.d/next/Library/2021-06-20-07-14-46.bpo-44458.myqCQ0.rst b/Misc/NEWS.d/next/Library/2021-06-20-07-14-46.bpo-44458.myqCQ0.rst new file mode 100644 index 0000000..f15104b --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-06-20-07-14-46.bpo-44458.myqCQ0.rst @@ -0,0 +1 @@ +``BUFFER_BLOCK_SIZE`` is now declared static, to avoid linking collisions when bz2, lmza or zlib are statically linked.
\ No newline at end of file |