Avoid potential for undefined variable 'startinpos' in PyUnicode_DecodeUTF7().

See issue #5389.

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 4c308ccfe0a9fbe6ce8817ffea9fec2b7674a6ab..af6f67a18b2f7c45cbe0e81003a592fa3aa36b37 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1012,7 +1012,7 @@ PyObject *PyUnicode_DecodeUTF7(const char *s,
                     }
                 } else if (SPECIAL(ch,0,0)) {
                     errmsg = "unexpected special character";
-                       goto utf7Error;
+                   goto utf7Error;
                 } else  {
                     *p++ = ch;
                 }
@@ -1036,9 +1036,10 @@ PyObject *PyUnicode_DecodeUTF7(const char *s,
             }
         }
         else if (SPECIAL(ch,0,0)) {
+            startinpos = s-starts;
             errmsg = "unexpected special character";
             s++;
-               goto utf7Error;
+            goto utf7Error;
         }
         else {
             *p++ = ch;