diff options
| author | Adam Harvey <aharvey@php.net> | 2015-02-02 11:11:05 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2015-02-02 11:11:05 +0000 |
| commit | db375cfd4dc2aabcd042c3a7cdd3c7faa479d557 (patch) | |
| tree | 4c8fbb2cf3a08df28bce2bd2aaa0f561c50a99b2 /ext/json/json.c | |
| parent | 675a12bbcfa0015198fb612b6850ad99c2e6977e (diff) | |
| parent | a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8 (diff) | |
| download | php-git-db375cfd4dc2aabcd042c3a7cdd3c7faa479d557.tar.gz | |
Merge branch 'PHP-5.5' into 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 a28f99e10e..ff3261ab24 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -839,6 +839,7 @@ static PHP_FUNCTION(json_decode) JSON_G(error_code) = 0; if (!str_len) { + JSON_G(error_code) = PHP_JSON_ERROR_SYNTAX; RETURN_NULL(); } |