Patch json_unescaped_unicode for JSON related Bug #53946

Patch version 2011-07-19 16:01 UTC

Obsoleted by patches:

• json_unescaped_unicode, revision 2011-08-29 12:57 UTC
• json_unescaped_unicode, revision 2011-08-29 14:04 UTC
• json_unescaped_unicode.patch, revision 2011-07-19 16:02 UTC

Developer: irker@php.net

Line 1 (now 1), was 53 lines, now 51 lines
 Index: ext/json/json.c
 ===================================================================
 --- ext/json/json.c	(revision 315701)
 Index: ext/json/php_json.h
 ===================================================================
 --- ext/json/php_json.h	(revision 306938)
 +++ ext/json/php_json.h	(working copy)
 @@ -62,6 +62,7 @@
  #define PHP_JSON_NUMERIC_CHECK	(1<<5)
  #define PHP_JSON_UNESCAPED_SLASHES	(1<<6)
  #define PHP_JSON_PRETTY_PRINT	(1<<7)
 +#define PHP_JSON_UNESCAPED_UNICODE	(1<<8)
  
  /* Internal flags */
  #define PHP_JSON_OUTPUT_ARRAY	0
 
 
 Index: ext/json/json.c
 ===================================================================
 --- ext/json/json.c	(revision 311708)
  +++ ext/json/json.c	(working copy)
  @@ -95,6 +95,7 @@
   	REGISTER_LONG_CONSTANT("JSON_NUMERIC_CHECK", PHP_JSON_NUMERIC_CHECK, CONST_CS | CONST_PERSISTENT);
   	REGISTER_LONG_CONSTANT("JSON_UNESCAPED_SLASHES", PHP_JSON_UNESCAPED_SLASHES, CONST_CS | CONST_PERSISTENT);
   	REGISTER_LONG_CONSTANT("JSON_PRETTY_PRINT", PHP_JSON_PRETTY_PRINT, CONST_CS | CONST_PERSISTENT);
 +	REGISTER_LONG_CONSTANT("JSON_UNESCAPED_UNICODE", PHP_JSON_UNESCAPED_UNICODE, CONST_CS | CONST_PERSISTENT);
  
 +	REGISTER_LONG_CONSTANT("JSON_UNESCAPED_UNICODE", PHP_JSON_UNESCAPED_UNICODE, CONST_CS | CONST_PERSISTENT);
  
   	REGISTER_LONG_CONSTANT("JSON_ERROR_NONE", PHP_JSON_ERROR_NONE, CONST_CS | CONST_PERSISTENT);
   	REGISTER_LONG_CONSTANT("JSON_ERROR_DEPTH", PHP_JSON_ERROR_DEPTH, CONST_CS | CONST_PERSISTENT);
 @@ -346,7 +347,7 @@
  
 @@ -347,6 +348,7 @@
   static void json_escape_string(smart_str *buf, char *s, int len, int options TSRMLS_DC) /* {{{ */
   {
 -	int pos = 0;
 +	int pos = 0, ulen = 0;
  	int pos = 0;
 +	int lenutf;
   	unsigned short us;
   	unsigned short *utf16;
   
 @@ -378,15 +379,14 @@
  		}
  		
  	}
 -
 -	utf16 = (unsigned short *) safe_emalloc(len, sizeof(unsigned short), 0);
 -
 -	len = utf8_to_utf16(utf16, s, len);
 -	if (len <= 0) {
 +	
 +	utf16 = (options & PHP_JSON_UNESCAPED_UNICODE) ? NULL : (unsigned short *) safe_emalloc(len, sizeof(unsigned short), 0);
 +	ulen = utf8_to_utf16(utf16, s, len);
 +	if (ulen <= 0) {
 @@ -381,6 +383,7 @@
  
  	utf16 = (unsigned short *) safe_emalloc(len, sizeof(unsigned short), 0);
  
 +	if (options & PHP_JSON_UNESCAPED_UNICODE) lenutf = len;
  	len = utf8_to_utf16(utf16, s, len);
  	if (len <= 0) {
   		if (utf16) {
  			efree(utf16);
  		}
 -		if (len < 0) {
 +		if (ulen < 0) {
  			JSON_G(error_code) = PHP_JSON_ERROR_UTF8;
  			if (!PG(display_errors)) {
  				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid UTF-8 sequence in argument");
 @@ -397,12 +397,15 @@
 @@ -397,12 +400,13 @@
   		}
   		return;
   	}
 +	if (!(options & PHP_JSON_UNESCAPED_UNICODE)) {
 +		len = ulen;
 +	}
 +	if (options & PHP_JSON_UNESCAPED_UNICODE) len = lenutf;
   
   	smart_str_appendc(buf, '"');
   
   	while (pos < len)
Line 56 (now 54), was 81 lines, now 13 lines

  +		us = (options & PHP_JSON_UNESCAPED_UNICODE) ? s[pos++] : utf16[pos++];
   
   		switch (us)
   		{
 @@ -479,7 +482,7 @@
 @@ -479,7 +483,7 @@
   				break;
  
  
   			default:
  -				if (us >= ' ' && (us & 127) == us) {
  +				if (us >= ' ' && ((options & PHP_JSON_UNESCAPED_UNICODE) || (us & 127) == us)) {
   					smart_str_appendc(buf, (unsigned char) us);
   				} else {
   					smart_str_appendl(buf, "\\u", 2);
 @@ -498,7 +501,9 @@
  	}
  
  	smart_str_appendc(buf, '"');
 -	efree(utf16);
 +	if (utf16) {
 +		efree(utf16);
 +	}
  }
  /* }}} */
  
 Index: ext/json/utf8_to_utf16.c
 ===================================================================
 --- ext/json/utf8_to_utf16.c	(revision 315701)
 +++ ext/json/utf8_to_utf16.c	(working copy)
 @@ -30,7 +30,7 @@
  #include "utf8_decode.h"
  
  int 
 -utf8_to_utf16(unsigned short w[], char p[], int length) 
 +utf8_to_utf16(unsigned short *w, char p[], int length) 
  {
      int c;
      int the_index = 0;
 @@ -43,14 +43,17 @@
              return (c == UTF8_END) ? the_index : UTF8_ERROR;
          }
          if (c < 0x10000) {
 -            w[the_index] = (unsigned short)c;
 +            if (w) {
 +                w[the_index] = (unsigned short)c;
 +            }
              the_index += 1;
          } else {
              c -= 0x10000;
 -            w[the_index] = (unsigned short)(0xD800 | (c >> 10));
 -            the_index += 1;
 -            w[the_index] = (unsigned short)(0xDC00 | (c & 0x3FF));
 -            the_index += 1;
 +            if (w) {
 +                w[the_index] = (unsigned short)(0xD800 | (c >> 10));
 +                w[the_index + 1] = (unsigned short)(0xDC00 | (c & 0x3FF));
 +            }
 +            the_index += 2;
          }
      }
  }
 Index: ext/json/utf8_to_utf16.h
 ===================================================================
 --- ext/json/utf8_to_utf16.h	(revision 315701)
 +++ ext/json/utf8_to_utf16.h	(working copy)
 @@ -1,3 +1,3 @@
  /* utf8_to_utf16.h */
  
 -extern int utf8_to_utf16(unsigned short w[], char p[], int length);
 +extern int utf8_to_utf16(unsigned short *w, char p[], int length);
 Index: ext/json/php_json.h
 ===================================================================
 --- ext/json/php_json.h	(revision 315701)
 +++ ext/json/php_json.h	(working copy)
 @@ -62,6 +62,7 @@
  #define PHP_JSON_NUMERIC_CHECK	(1<<5)
  #define PHP_JSON_UNESCAPED_SLASHES	(1<<6)
  #define PHP_JSON_PRETTY_PRINT	(1<<7)
 +#define PHP_JSON_UNESCAPED_UNICODE	(1<<8)
  
  /* Internal flags */
  #define PHP_JSON_OUTPUT_ARRAY	0