From 5b0e9e84e9833337f791d5bc74f823a16681924b Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 9 Oct 2010 15:24:28 +0000
Subject: Issue #10055: Make json C89-compliant in UCS4 mode.

---
 Misc/NEWS       | 2 ++
 Modules/_json.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index ac731c5..94f0d86 100644
--- 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.
diff --git a/Modules/_json.c b/Modules/_json.c
index bbaf7dd..dd9749b 100644
--- 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':
-- 
cgit v0.12