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 | |
parent | 675a12bbcfa0015198fb612b6850ad99c2e6977e (diff) | |
parent | a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8 (diff) | |
download | php-git-db375cfd4dc2aabcd042c3a7cdd3c7faa479d557.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | ext/json/json.c | 1 | ||||
-rw-r--r-- | ext/json/tests/bug54484.phpt | 9 | ||||
-rw-r--r-- | ext/json/tests/bug68938.phpt | 11 |
4 files changed, 23 insertions, 2 deletions
@@ -27,6 +27,10 @@ . Fixed bug #68571 (core dump when webserver close the socket). (redfoxli069 at gmail dot com, Laruence) +- JSON: + . Fixed bug #68938 (json_decode() decodes empty string without error). + (jeremy at bat-country dot us) + - LIBXML: . Fixed bug #64938 (libxml_disable_entity_loader setting is shared between threads). (Martin Jansen) 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(); } diff --git a/ext/json/tests/bug54484.phpt b/ext/json/tests/bug54484.phpt index d698ab5416..e56d8bd86b 100644 --- a/ext/json/tests/bug54484.phpt +++ b/ext/json/tests/bug54484.phpt @@ -15,11 +15,16 @@ json_decode("invalid json"); var_dump(json_last_error()); +json_decode("\001 invalid json"); +var_dump(json_last_error()); + + json_decode(""); var_dump(json_last_error()); ?> --EXPECT-- int(0) -int(0) int(4) -int(0) +int(4) +int(3) +int(4) diff --git a/ext/json/tests/bug68938.phpt b/ext/json/tests/bug68938.phpt new file mode 100644 index 0000000000..f6291ffe62 --- /dev/null +++ b/ext/json/tests/bug68938.phpt @@ -0,0 +1,11 @@ +--TEST-- +Bug #68938 (json_decode() decodes empty string without indicating error) +--SKIPIF-- +<?php if (!extension_loaded("json")) print "skip"; ?> +--FILE-- +<?php +json_decode(""); +var_dump(json_last_error()); +?> +--EXPECT-- +int(4) |