Skip to content

bpo-35559: Use compiled regex in base64.b16decode #11287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tirkarthi wants to merge 3 commits into from
Closed

bpo-35559: Use compiled regex in base64.b16decode #11287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a476b39
Use compiled regex in b16decode for validation
tirkarthi Dec 22, 2018
d15ad6f
Use bound method for validation
tirkarthi Dec 22, 2018
fcb43b5
Add NEWS entry
tirkarthi Dec 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Lib/base64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@


bytes_types = (bytes, bytearray) # Types acceptable as binary data
_has_non_base16_digits = re.compile(b'[^0-9A-F]').search

def _bytes_from_decode_data(s):
if isinstance(s, str):
Expand Down Expand Up @@ -263,7 +264,7 @@ def b16decode(s, casefold=False):
s = _bytes_from_decode_data(s)
if casefold:
s = s.upper()
if re.search(b'[^0-9A-F]', s):
if _has_non_base16_digits(s):
raise binascii.Error('Non-base16 digit found')
return binascii.unhexlify(s)

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2018-12-22-13-05-27.bpo-35559.RlGyr2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Use compiled regex in :func:`base64.b16decode` for validation.
Patch by Karthikeyan Singaravelan.