[3.8] bpo-39068: Fix race condition in base64 (GH-17627) (GH-24022)
There was a race condition in base64 in lazy initialization of multiple globals.
(cherry picked from commit 9655434cca
)
Co-authored-by: Brandon Stansbury <brandonrstansbury@gmail.com>
This commit is contained in:
parent
187785e2fa
commit
b863607d30
|
@ -320,7 +320,7 @@ def a85encode(b, *, foldspaces=False, wrapcol=0, pad=False, adobe=False):
|
|||
global _a85chars, _a85chars2
|
||||
# Delay the initialization of tables to not waste memory
|
||||
# if the function is never called
|
||||
if _a85chars is None:
|
||||
if _a85chars2 is None:
|
||||
_a85chars = [bytes((i,)) for i in range(33, 118)]
|
||||
_a85chars2 = [(a + b) for a in _a85chars for b in _a85chars]
|
||||
|
||||
|
@ -428,7 +428,7 @@ def b85encode(b, pad=False):
|
|||
global _b85chars, _b85chars2
|
||||
# Delay the initialization of tables to not waste memory
|
||||
# if the function is never called
|
||||
if _b85chars is None:
|
||||
if _b85chars2 is None:
|
||||
_b85chars = [bytes((i,)) for i in _b85alphabet]
|
||||
_b85chars2 = [(a + b) for a in _b85chars for b in _b85chars]
|
||||
return _85encode(b, _b85chars, _b85chars2, pad)
|
||||
|
|
|
@ -1607,6 +1607,7 @@ Tage Stabell-Kulo
|
|||
Quentin Stafford-Fraser
|
||||
Frank Stajano
|
||||
Joel Stanley
|
||||
Brandon Stansbury
|
||||
Anthony Starks
|
||||
David Steele
|
||||
Oliver Steele
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Fix initialization race condition in :func:`a85encode` and :func:`b85encode`
|
||||
in :mod:`base64`. Patch by Brandon Stansbury.
|
Loading…
Reference in New Issue