diff options
| author | Adam Harvey <aharvey@php.net> | 2015-02-02 11:07:34 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2015-02-02 11:07:34 +0000 |
| commit | a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8 (patch) | |
| tree | 7ac46431e85176df9b2a9a5e5a7bf7d8b5c16999 /ext/json/json.c | |
| parent | fb803ff81993eb8acde0cdd5f513b6253221c349 (diff) | |
| download | php-git-a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8.tar.gz | |
json_decode() should generate a syntax error when given "".
Fixes bug #68938 (json_decode() decodes empty string without error).
Patch by jeremy at bat-country dot us.
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 5b71eb06f6..27aed969d9 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -818,6 +818,7 @@ static PHP_FUNCTION(json_decode) JSON_G(error_code) = 0; if (!str_len) { + JSON_G(error_code) = PHP_JSON_ERROR_SYNTAX; RETURN_NULL(); } |