Skip to content

bpo-44678: Separate error message for discontinuous padding in binascii.a2b_base64 strict mode #27249

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

Merged
gpshead merged 5 commits into from
Jul 19, 2021
Merged

bpo-44678: Separate error message for discontinuous padding in binascii.a2b_base64 strict mode #27249

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11ea638
Renamed assertLeadingPadding function to match logic
idan22moral Jul 19, 2021
00e63a9
Added a seperate error message for discontinuous padding
idan22moral Jul 19, 2021
45bfb77
Updated the tests for discontinuous padding
idan22moral Jul 19, 2021
9501e7e
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 19, 2021
beb8f04
seperate -> separate
gpshead Jul 19, 2021
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
Prev Previous commit
Next Next commit
Added a seperate error message for discontinuous padding
  • Loading branch information
@idan22moral
idan22moral committed Jul 19, 2021
commit 00e63a9d864850d99ac33518adb05b8ab2f401e7
7 changes: 5 additions & 2 deletions Modules/binascii.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,6 @@ binascii_a2b_base64_impl(PyObject *module, Py_buffer *data, int strict_mode)
unsigned char *bin_data_start = bin_data;

if (strict_mode && ascii_len > 0 && ascii_data[0] == '=') {
malformed_padding:
state = get_binascii_state(module);
if (state) {
PyErr_SetString(state->Error, "Leading padding not allowed");
Expand Down Expand Up @@ -516,7 +515,11 @@ binascii_a2b_base64_impl(PyObject *module, Py_buffer *data, int strict_mode)

// Characters that are not '=', in the middle of the padding, are not allowed
if (strict_mode && padding_started) {
goto malformed_padding;
state = get_binascii_state(module);
if (state) {
PyErr_SetString(state->Error, "Discontinuous padding not allowed");
}
goto error_end;
}
pads = 0;

Expand Down