cvs: php-src /ext/json JSON_parser.c

tony2001 Fri Jun 8 08:57:21 2007 UTC Modified files: /php-src/ext/json JSON_parser.c Log: oops, empty properties are not allowed http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.12&r2=1.13&diff_format=u Index: php-src/ext/json/JSON_parser.c diff -u php-src/ext/json/JSON_parser.c:1.12 php-src/ext/json/JSON_parser.c:1.13 --- php-src/ext/json/JSON_parser.c:1.12 Fri Jun 8 08:51:46 2007 +++ php-src/ext/json/JSON_parser.c Fri Jun 8 08:57:21 2007 @@ -357,7 +357,7 @@ { if (!assoc) { - add_utf8_property_zval_ex(root, (key->len ? key->c : ""), (key->len ? (key->len + 1) : sizeof("")), child TSRMLS_CC); + add_utf8_property_zval_ex(root, (key->len ? key->c : "_empty_"), (key->len ? (key->len + 1) : sizeof("_empty_")), child TSRMLS_CC); #if PHP_MAJOR_VERSION >= 5 ZVAL_DELREF(child); #endif @@ -500,7 +500,7 @@ if (!assoc) { - add_utf8_property_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : ""), (key.len ? (key.len + 1) : sizeof("")), mval TSRMLS_CC); + add_utf8_property_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : "_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), mval TSRMLS_CC); #if PHP_MAJOR_VERSION >= 5 ZVAL_DELREF(mval); #endif @@ -631,7 +631,7 @@ { if (!assoc) { - add_utf8_property_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : ""), (key.len ? (key.len + 1) : sizeof("")), mval TSRMLS_CC); + add_utf8_property_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : "_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), mval TSRMLS_CC); #if PHP_MAJOR_VERSION >= 5 ZVAL_DELREF(mval); #endif