[Python-checkins] r85344 - in python/branches/release27-maint: Misc/NEWS Modules/_json.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Sat Oct  9 17:28:59 2010
New Revision: 85344

Log:
Merged revisions 85342 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85342 | antoine.pitrou | 2010-10-09 17:24:28 +0200 (sam., 09 oct. 2010) | 4 lines
  
  Issue #10055: Make json C89-compliant in UCS4 mode.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Misc/NEWS
   python/branches/release27-maint/Modules/_json.c

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sat Oct  9 17:28:59 2010
@@ -368,6 +368,8 @@
 Build
 -----
 
+- Issue #10055: Make json C89-compliant in UCS4 mode.
+
 - Issue #1633863: Don't ignore $CC under AIX.
 
 - Issue #9810: Compile bzip2 source files in python's project file

Modified: python/branches/release27-maint/Modules/_json.c
==============================================================================
--- python/branches/release27-maint/Modules/_json.c	(original)
+++ python/branches/release27-maint/Modules/_json.c	Sat Oct  9 17:28:59 2010
@@ -564,8 +564,8 @@
                 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':
@@ -755,8 +755,8 @@
                 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':