commit f10567233237673e8b96aff8a9753a6426fa4474
author Serhiy Storchaka <storchaka@gmail.com> Sat Oct 19 20:37:49 2013 +0300
committer Serhiy Storchaka <storchaka@gmail.com> Sat Oct 19 20:37:49 2013 +0300
tree ab3f498abfd5de6c0396f45765f0b9d02773ec20
parent 6ea3c9b22a3e81e6484a30c1d64c6a859a40da6a

Issue #19279: UTF-7 decoder no more produces illegal unicode strings.

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 866eb9b..5ce9c88 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1671,6 +1671,7 @@
                                        (base64buffer >> (base64bits-16));
                     base64bits -= 16;
                     base64buffer &= (1 << base64bits) - 1; /* clear high bits */
+                    assert(outCh <= 0xffff);
                     if (surrogate) {
                         /* expecting a second surrogate */
                         if (outCh >= 0xDC00 && outCh <= 0xDFFF) {
@@ -1737,6 +1738,7 @@
                 inShift = 1;
                 shiftOutStart = p;
                 base64bits = 0;
+                base64buffer = 0;
             }
         }
         else if (DECODE_DIRECT(ch)) { /* character decodes as itself */