Commit3bdb2d9

and

authored

bpo-39055: Reject a trailing \n in base64.b64decode() with validate=True. (GH-17616)

(cherry picked from commitb19c0d7)Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

1 parent880a17a commit3bdb2d9Copy full SHA for 3bdb2d9

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ def b64decode(s, altchars=None, validate=False):`
`82`	`82`	`altchars=_bytes_from_decode_data(altchars)`
`83`	`83`	`assertlen(altchars)==2,repr(altchars)`
`84`	`84`	`s=s.translate(bytes.maketrans(altchars,b'+/'))`
`85`		`-ifvalidateandnotre.match(b'^[A-Za-z0-9+/]*={0,2}$',s):`
	`85`	`+ifvalidateandnotre.fullmatch(b'[A-Za-z0-9+/]*={0,2}',s):`
`86`	`86`	`raisebinascii.Error('Non-base64 digit found')`
`87`	`87`	`returnbinascii.a2b_base64(s)`
`88`	`88`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,7 @@ def test_b64decode_invalid_chars(self):`
`250`	`250`	`(b'3d}==',b'\xdd'),`
`251`	`251`	`(b'@@',b''),`
`252`	`252`	`(b'!',b''),`
	`253`	`+ (b"YWJj\n",b"abc"),`
`253`	`254`	`(b'YWJj\nYWI=',b'abcab'))`
`254`	`255`	`funcs= (`
`255`	`256`	`base64.b64decode,`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+:func:`base64.b64decode` with ``validate=True`` raises now a binascii.Error
	`2`	+if the input ends with a single ``\n``.

Comments

(0)

ページ先頭