Issue #10055: Make json C89-compliant in UCS4 mode.

2010-10-09 15:24:28 +00:00 · 2010-10-09 15:24:28 +00:00 · 5b0e9e84e9
parent 8382d0fe2e
commit 5b0e9e84e9
2 changed files with 3 additions and 1 deletions
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -346,6 +346,8 @@ Tests
 Build
 -----

+- Issue #10055: Make json C89-compliant in UCS4 mode.
+
 - Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows)

 - Issue #1633863: Don't ignore $CC under AIX.
--- a/Modules/_json.c
+++ b/Modules/_json.c
@ -440,8 +440,8 @@ scanstring_unicode(PyObject *pystr, Py_ssize_t end, int strict, Py_ssize_t *next
                end += 6;
                /* Decode 4 hex digits */
                for (; next < end; next++) {
-                    c2 <<= 4;
                    Py_UNICODE digit = buf[next];
+                    c2 <<= 4;
                    switch (digit) {
                        case '0': case '1': case '2': case '3': case '4':
                        case '5': case '6': case '7': case '8': case '9':