diff options
| author | Adam Harvey <aharvey@php.net> | 2015-02-02 11:12:27 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2015-02-02 11:12:27 +0000 |
| commit | 9e20b64a5b97907fe557cc611535c697bab44a75 (patch) | |
| tree | e86e871e76eca509e67e4c63dceda24869d7599f /ext/json/json.c | |
| parent | c7eea5a79b684469020e66ce8a2999aaab54f875 (diff) | |
| parent | db375cfd4dc2aabcd042c3a7cdd3c7faa479d557 (diff) | |
| download | php-git-9e20b64a5b97907fe557cc611535c697bab44a75.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index baad4bc399..69eca65a45 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -838,6 +838,7 @@ static PHP_FUNCTION(json_decode) JSON_G(error_code) = 0; if (!str_len) { + JSON_G(error_code) = PHP_JSON_ERROR_SYNTAX; RETURN_NULL(); } |