diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-02-03 23:01:48 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-02-03 23:01:48 +0800 |
| commit | 38829b3b4beee0e6bed9b4c6443e86bceaa2d37d (patch) | |
| tree | f460cf0a3d38a8b62b7c0912035eb47f71658e01 /ext/json/json.c | |
| parent | 5a5c8551540c6a09bc2a7256b7703b91d7f118c2 (diff) | |
| parent | 67207166827b2c91e82e0cacab568f62c70ceef0 (diff) | |
| download | php-git-38829b3b4beee0e6bed9b4c6443e86bceaa2d37d.tar.gz | |
Merge branch 'master' into resource-api
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(); } |