diff options
| author | Julien Pauli <jpauli@php.net> | 2015-02-04 12:48:57 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-02-04 12:48:57 +0100 |
| commit | 93315c4e1d514c2824bbadc23337603314db8f63 (patch) | |
| tree | c46d4a39c9c6583113c19cbfc6af5f5ca3750d8b | |
| parent | 4c3b4dc74af13eec25ad460551df8fd4b3984269 (diff) | |
| parent | c85f12e3aca8d1da64504018e421a766ab66e574 (diff) | |
| download | php-git-93315c4e1d514c2824bbadc23337603314db8f63.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Revert "json_decode() should generate a syntax error when given ""."
Update NEWS
| -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 |
3 files changed, 2 insertions, 19 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index ff3261ab24..a28f99e10e 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -839,7 +839,6 @@ 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 e56d8bd86b..d698ab5416 100644 --- a/ext/json/tests/bug54484.phpt +++ b/ext/json/tests/bug54484.phpt @@ -15,16 +15,11 @@ 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(4) -int(3) -int(4) +int(0) diff --git a/ext/json/tests/bug68938.phpt b/ext/json/tests/bug68938.phpt deleted file mode 100644 index f6291ffe62..0000000000 --- a/ext/json/tests/bug68938.phpt +++ /dev/null @@ -1,11 +0,0 @@ ---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) |