archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #41504 (json_decode() incorrectly decodes JSON arrays with empty

Browse source 
string keys).
This commit is contained in:
Ilia Alshanetsky 2007-05-27 16:31:35 +00:00
parent 2c5368c013
commit faae3e9ecf
3 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -2,6 +2,8 @@ PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Jun 2007, PHP 5.2.3 ?? Jun 2007, PHP 5.2.3
- Fixed bug #41511 (Compile failure under IRIX 6.5.30 building md5.c). (Jani) - Fixed bug #41511 (Compile failure under IRIX 6.5.30 building md5.c). (Jani)
- Fixed bug #41504 (json_decode() incorrectly decodes JSON arrays with empty
string keys). (Ilia)
24 May 2007, PHP 5.2.3RC1 24 May 2007, PHP 5.2.3RC1
- Changed CGI install target to php-cgi and 'make install' to install CLI - Changed CGI install target to php-cgi and 'make install' to install CLI

6
ext/json/JSON_parser.c
View file

@ -364,7 +364,7 @@ static void attach_zval(json_parser *json, int up, int cur, smart_str *key, int
} }
else else
{ {
add_assoc_zval_ex(root, (key->len ? key->c : "_empty_"), (key->len ? (key->len + 1) : sizeof("_empty_")), child); add_assoc_zval_ex(root, (key->len ? key->c : ""), (key->len ? (key->len + 1) : sizeof("")), child);
} }
key->len = 0; key->len = 0;
} }
@ -507,7 +507,7 @@ JSON_parser(zval *z, unsigned short p[], int length, int assoc TSRMLS_DC)
} }
else else
{ {
add_assoc_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : "_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), mval); add_assoc_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : ""), (key.len ? (key.len + 1) : sizeof("")), mval);
} }
key.len = 0; key.len = 0;
buf.len = 0; buf.len = 0;
@ -638,7 +638,7 @@ JSON_parser(zval *z, unsigned short p[], int length, int assoc TSRMLS_DC)
} }
else else
{ {
add_assoc_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : "_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), mval); add_assoc_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c : ""), (key.len ? (key.len + 1) : sizeof("")), mval);
} }
key.len = 0; key.len = 0;
} }

29
ext/json/tests/bug41504.phpt Normal file
View file

@ -0,0 +1,29 @@
--TEST--
Bug #41504 (json_decode() converts empty array keys to "_empty_")
--FILE--
<?php
var_dump(json_decode('{"":"value"}', true));
var_dump(json_decode('{"":"value", "key":"value"}', true));
var_dump(json_decode('{"key":"value", "":"value"}', true));
echo "Done\n";
?>
--EXPECT--
array(1) {
[""]=>
string(5) "value"
}
array(2) {
[""]=>
string(5) "value"
["key"]=>
string(5) "value"
}
array(2) {
["key"]=>
string(5) "value"
[""]=>
string(5) "value"
}
Done