tony2001 Fri Jun 8 08:51:46 2007 UTC
Modified files:
/php-src/ext/json JSON_parser.c
Log:
MFB: fix #41504 (json_decode() incorrectly decodes JSON arrays with empty
string keys).
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.11 php-src/ext/json/JSON_parser.c:1.12
--- php-src/ext/json/JSON_parser.c:1.11 Thu May 24 22:39:06 2007
+++ php-src/ext/json/JSON_parser.c Fri Jun 8 08:51:46 2007
@@ -357,14 +357,14 @@
{
if (!assoc)
{
- add_utf8_property_zval_ex(root, (key->len ? key->c : "_empty_"),
(key->len ? (key->len + 1) : sizeof("_empty_")), child TSRMLS_CC);
+ add_utf8_property_zval_ex(root, (key->len ? key->c : ""),
(key->len ? (key->len + 1) : sizeof("")), child TSRMLS_CC);
#if PHP_MAJOR_VERSION >= 5
ZVAL_DELREF(child);
#endif
}
else
{
- add_utf8_assoc_zval_ex(root, (key->len ? key->c : "_empty_"),
(key->len ? (key->len + 1) : sizeof("_empty_")), child);
+ add_utf8_assoc_zval_ex(root, (key->len ? key->c : ""), (key->len ?
(key->len + 1) : sizeof("")), child);
}
key->len = 0;
}
@@ -500,14 +500,14 @@
if (!assoc)
{
-
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);
+
add_utf8_property_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c :
""), (key.len ? (key.len + 1) : sizeof("")), mval TSRMLS_CC);
#if PHP_MAJOR_VERSION >= 5
ZVAL_DELREF(mval);
#endif
}
else
{
-
add_utf8_assoc_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c :
"_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), mval);
+
add_utf8_assoc_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : ""),
(key.len ? (key.len + 1) : sizeof("")), mval);
}
key.len = 0;
buf.len = 0;
@@ -631,14 +631,14 @@
{
if (!assoc)
{
-
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);
+
add_utf8_property_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c :
""), (key.len ? (key.len + 1) : sizeof("")), mval TSRMLS_CC);
#if PHP_MAJOR_VERSION >= 5
ZVAL_DELREF(mval);
#endif
}
else
{
-
add_utf8_assoc_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c :
"_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), mval);
+
add_utf8_assoc_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : ""),
(key.len ? (key.len + 1) : sizeof("")), mval);
}
key.len = 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
