bpo-34164: Fix handling of incorrect padding in base64.b32decode(). #8351
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Now base64.Error is always raised instead of UnboundLocalError or OverflowError.
serhiy-storchaka
added
type-bug
vstinner
approved these changes
Jul 21, 2018
Member
vstinner
left a comment
vstinner
left a comment
There was a problem hiding this comment.
LGTM. I just have a minor suggestion.
Member
Author
|
What is your suggestion? |
vstinner
reviewed
Jul 21, 2018
Lib/base64.py
Outdated
| decoded[-5:] = last[:-4] | ||
| else: | ||
| raise binascii.Error('Incorrect padding') | ||
| decoded[-5:] = last[:-((padchars * 5 + 4) // 8)] |
Member
There was a problem hiding this comment.
I would suggest to put the complex operation a a separated line. Example:
n = ((padchars * 5 + 4) // 8)
decoded[-5:] = last[:-n]
Oh, GitHub lost my comment. I had to write it again.
Member
Author
There was a problem hiding this comment.
leftover = (43 - 5 * padchars) // 8 # 1: 4, 3: 3, 4: 2, 6: 1or
leftover = (5, 4, 4, 3, 2, 2, 1, 1, 0)[padchars]or
leftover = (..., 4, ..., 3, 2, ..., 1)[padchars]What is better?
Contributor
|
Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7. |
Contributor
|
Sorry @serhiy-storchaka, I had trouble checking out the |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Jul 24, 2018
…ythonGH-8351) Now base64.Error is always raised instead of UnboundLocalError or OverflowError. (cherry picked from commit ac0b3c2) Co-authored-by: Serhiy Storchaka <[email protected]>
|
GH-8435 is a backport of this pull request to the 3.7 branch. |
serhiy-storchaka
added a commit
that referenced
this pull request
Jul 24, 2018
…H-8351) (GH-8435) Now base64.Error is always raised instead of UnboundLocalError or OverflowError. (cherry picked from commit ac0b3c2) Co-authored-by: Serhiy Storchaka <[email protected]>
serhiy-storchaka
added a commit
to serhiy-storchaka/cpython
that referenced
this pull request
Jul 24, 2018
…e(). (pythonGH-8351) Now base64.Error is always raised instead of UnboundLocalError or OverflowError. (cherry picked from commit ac0b3c2) Co-authored-by: Serhiy Storchaka <[email protected]>
|
GH-8436 is a backport of this pull request to the 3.6 branch. |
serhiy-storchaka
added a commit
that referenced
this pull request
Jul 24, 2018
…e(). (GH-8351) (GH-8436) Now base64.Error is always raised instead of UnboundLocalError or OverflowError. (cherry picked from commit ac0b3c2) Co-authored-by: Serhiy Storchaka <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now base64.Error is always raised instead of UnboundLocalError or
OverflowError.
https://bugs.python.org/issue34164