From 445f7774803ef1e99eaa2ab8a68942d608b2066d Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 8 Jun 2007 08:51:46 +0000 Subject: [PATCH] MFB: fix #41504 (json_decode() incorrectly decodes JSON arrays with empty string keys). --- ext/json/JSON_parser.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/json/JSON_parser.c b/ext/json/JSON_parser.c index 6939a6d9e9f..36298fbbc51 100644 --- a/ext/json/JSON_parser.c +++ b/ext/json/JSON_parser.c @@ -357,14 +357,14 @@ static void attach_zval(json_parser *json, int up, int cur, smart_str *key, int { 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 @@ JSON_parser(zval *z, unsigned short p[], int length, int assoc TSRMLS_DC) 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 @@ JSON_parser(zval *z, unsigned short p[], int length, int assoc TSRMLS_DC) { 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; }