From d41f40879c3466a27654debb74b5d67f2a86bf85 Mon Sep 17 00:00:00 2001
From: Moreal <dev.moreal@gmail.com>
Date: Mon, 19 Dec 2022 22:25:38 +0900
Subject: [PATCH] Allow trailing bits while decoding base64

---
 stdlib/src/binascii.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/stdlib/src/binascii.rs b/stdlib/src/binascii.rs
index d0bb23752..c9fd34877 100644
--- a/stdlib/src/binascii.rs
+++ b/stdlib/src/binascii.rs
@@ -2,8 +2,13 @@ pub(crate) use decl::make_module;
 
 pub(super) use decl::crc32;
 
+pub fn decode<T: AsRef<[u8]>>(input: T) -> Result<Vec<u8>, base64::DecodeError> {
+    base64::decode_config(input, base64::STANDARD.decode_allow_trailing_bits(true))
+}
+
 #[pymodule(name = "binascii")]
 mod decl {
+    use super::decode;
     use crate::vm::{
         builtins::{PyBaseExceptionRef, PyIntRef, PyTypeRef},
         function::{ArgAsciiBuffer, ArgBytesLike, OptionalArg},
@@ -168,7 +173,7 @@ mod decl {
 
         s.with_ref(|b| {
             let decoded = if b.len() % 4 == 0 {
-                base64::decode(b)
+                decode(b)
             } else {
                 Err(base64::DecodeError::InvalidLength)
             };
@@ -181,7 +186,7 @@ mod decl {
                 if buf.len() % 4 != 0 {
                     return Err(base64::DecodeError::InvalidLength);
                 }
-                base64::decode(&buf)
+                decode(&buf)
             })
         })
         .map_err(|err| new_binascii_error(format!("error decoding base64: {err}"), vm))