archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0'

Browse source
This commit is contained in:
Xinchen Hui 2016-04-22 21:41:52 -07:00
commit fa5f28a0a1
3 changed files with 34 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/json/json.c
View file

@ -254,7 +254,7 @@ static PHP_FUNCTION(json_decode)
return;
}
JSON_G(error_code) = 0;
JSON_G(error_code) = PHP_JSON_ERROR_NONE;
if (!str_len) {
JSON_G(error_code) = PHP_JSON_ERROR_SYNTAX;