diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-02-25 03:42:39 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 03:42:39 (GMT) |
| commit | daef21ce7dfd3735101d85d6ebf7554187c33ab8 (patch) | |
| tree | 5d82af9309af1da8df7a385e2e2b1692e5f0cf0f | |
| parent | 1f4cf0c22b00fefb17611546755b65d3cb488330 (diff) | |
| download | cpython-daef21ce7dfd3735101d85d6ebf7554187c33ab8.zip cpython-daef21ce7dfd3735101d85d6ebf7554187c33ab8.tar.gz cpython-daef21ce7dfd3735101d85d6ebf7554187c33ab8.tar.bz2 | |
bpo-30566: Fix IndexError when using punycode codec (GH-18632)
Trying to decode an invalid string with the punycode codec
shoud raise UnicodeError.
(cherry picked from commit ba22e8f174309979d90047c5dc64fcb63bc2c32e)
Co-authored-by: Berker Peksag <berker.peksag@gmail.com>
| -rw-r--r-- | Lib/encodings/punycode.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_codecs.py | 12 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-02-24-03-45-28.bpo-30566.qROxty.rst | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/Lib/encodings/punycode.py b/Lib/encodings/punycode.py index 66c5101..1c57264 100644 --- a/Lib/encodings/punycode.py +++ b/Lib/encodings/punycode.py @@ -143,7 +143,7 @@ def decode_generalized_number(extended, extpos, bias, errors): digit = char - 22 # 0x30-26 elif errors == "strict": raise UnicodeError("Invalid extended code point '%s'" - % extended[extpos]) + % extended[extpos-1]) else: return extpos, None t = T(j, bias) diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py index b37525b..8c10e94 100644 --- a/Lib/test/test_codecs.py +++ b/Lib/test/test_codecs.py @@ -1331,6 +1331,18 @@ class PunycodeTest(unittest.TestCase): puny = puny.decode("ascii").encode("ascii") self.assertEqual(uni, puny.decode("punycode")) + def test_decode_invalid(self): + testcases = [ + (b"xn--w&", "strict", UnicodeError()), + (b"xn--w&", "ignore", "xn-"), + ] + for puny, errors, expected in testcases: + with self.subTest(puny=puny, errors=errors): + if isinstance(expected, Exception): + self.assertRaises(UnicodeError, puny.decode, "punycode", errors) + else: + self.assertEqual(puny.decode("punycode", errors), expected) + # From http://www.gnu.org/software/libidn/draft-josefsson-idn-test-vectors.html nameprep_tests = [ diff --git a/Misc/NEWS.d/next/Library/2020-02-24-03-45-28.bpo-30566.qROxty.rst b/Misc/NEWS.d/next/Library/2020-02-24-03-45-28.bpo-30566.qROxty.rst new file mode 100644 index 0000000..c780633 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-02-24-03-45-28.bpo-30566.qROxty.rst @@ -0,0 +1,2 @@ +Fix :exc:`IndexError` when trying to decode an invalid string with punycode +codec. |