From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 5 Oct 2015 11:49:26 +0000 (+0200)
Subject: Issue #25301: Fix compatibility with ISO C90
X-Git-Tag: v3.6.0a1~1325
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74e8fac3c844796bdef5fccfa345784258b899e9;p=thirdparty%2FPython%2Fcpython.git

Issue #25301: Fix compatibility with ISO C90
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 56614e6b8d9b..3d7840403c1d 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4795,9 +4795,12 @@ PyUnicode_DecodeUTF8Stateful(const char *s,
             break;
 
         case _Py_ERROR_SURROGATEESCAPE:
+        {
+            Py_ssize_t i;
+
             if (_PyUnicodeWriter_PrepareKind(&writer, PyUnicode_2BYTE_KIND) < 0)
                 goto onError;
-            for (Py_ssize_t i=startinpos; i<endinpos; i++) {
+            for (i=startinpos; i<endinpos; i++) {
                 ch = (Py_UCS4)(unsigned char)(starts[i]);
                 PyUnicode_WRITE(writer.kind, writer.data, writer.pos,
                                 ch + 0xdc00);
@@ -4805,6 +4808,7 @@ PyUnicode_DecodeUTF8Stateful(const char *s,
             }
             s += (endinpos - startinpos);
             break;
+        }
 
         default:
             if (unicode_decode_call_errorhandler_writer(