commit 0b2716918345b2bff0bb5c36086d5de368125536
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Tue Jul 24 03:53:39 2018 -0700
committer Serhiy Storchaka <storchaka@gmail.com> Tue Jul 24 13:53:39 2018 +0300
tree 0b5d8563abf3437c5da53b57e8a42ed71524027b
parent 220afffb683af1ba9e04c37535cfaa41348e9ebb

bpo-34164: Fix handling of incorrect padding in base64.b32decode(). (GH-8351) (GH-8435)

Now base64.Error is always raised instead of UnboundLocalError or
OverflowError.
(cherry picked from commit ac0b3c2f4d86fc056b833a4e6b9a380741244a63)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Lib/test/test_base64.py

diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
index 4754739..2a4cc2a 100644
--- a/Lib/test/test_base64.py
+++ b/Lib/test/test_base64.py
@@ -343,11 +343,20 @@
             self.assertRaises(binascii.Error, base64.b32decode, data_str)
 
     def test_b32decode_error(self):
-        for data in [b'abc', b'ABCDEF==', b'==ABCDEF']:
-            with self.assertRaises(binascii.Error):
-                base64.b32decode(data)
-            with self.assertRaises(binascii.Error):
-                base64.b32decode(data.decode('ascii'))
+        tests = [b'abc', b'ABCDEF==', b'==ABCDEF']
+        prefixes = [b'M', b'ME', b'MFRA', b'MFRGG', b'MFRGGZA', b'MFRGGZDF']
+        for i in range(0, 17):
+            if i:
+                tests.append(b'='*i)
+            for prefix in prefixes:
+                if len(prefix) + i != 8:
+                    tests.append(prefix + b'='*i)
+        for data in tests:
+            with self.subTest(data=data):
+                with self.assertRaises(binascii.Error):
+                    base64.b32decode(data)
+                with self.assertRaises(binascii.Error):
+                    base64.b32decode(data.decode('ascii'))
 
     def test_b16encode(self):
         eq = self.assertEqual