mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.3' into PHP-5.4

Browse Source 
* PHP-5.3:
  Improve JSON error handling

Conflicts:
	ext/json/tests/bug54058.phpt
	ext/json/tests/bug61537.phpt
This commit is contained in:
Nikita Popov 2012-06-27 12:28:55 +02:00
commit d372b33c9b
12 changed files with 114 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ext/json/json.c
View File

@ -55,7 +55,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_json_decode, 0, 0, 1)
ZEND_ARG_INFO(0, options)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_json_last_error, 0)
ZEND_BEGIN_ARG_INFO_EX(arginfo_json_last_error, 0, 0, 0)
ZEND_ARG_INFO(0, as_string)
ZEND_END_ARG_INFO()
/* }}} */
@ -236,7 +237,6 @@ static void json_encode_array(smart_str *buf, zval **val, int options TSRMLS_DC)
if (myht && myht->nApplyCount > 1) {
JSON_G(error_code) = PHP_JSON_ERROR_RECURSION;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "recursion detected");
smart_str_appendl(buf, "null", 4);
return;
}
@ -378,7 +378,6 @@ static void json_escape_string(smart_str *buf, char *s, int len, int options TSR
efree(tmp);
} else {
JSON_G(error_code) = PHP_JSON_ERROR_INF_OR_NAN;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "double %.9g does not conform to the JSON spec", d);
smart_str_appendc(buf, '0');
}
}
@ -395,7 +394,6 @@ static void json_escape_string(smart_str *buf, char *s, int len, int options TSR
}
if (ulen < 0) {
JSON_G(error_code) = PHP_JSON_ERROR_UTF8;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid UTF-8 sequence in argument");
smart_str_appendl(buf, "null", 4);
} else {
smart_str_appendl(buf, "\"\"", 2);
@ -527,7 +525,6 @@ static void json_encode_serializable_object(smart_str *buf, zval *val, int optio
if (myht && myht->nApplyCount > 1) {
JSON_G(error_code) = PHP_JSON_ERROR_RECURSION;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "recursion detected");
smart_str_appendl(buf, "null", 4);
return;
}
@ -592,7 +589,6 @@ PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_
efree(d);
} else {
JSON_G(error_code) = PHP_JSON_ERROR_INF_OR_NAN;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "double %.9g does not conform to the JSON spec", dbl);
smart_str_appendc(buf, '0');
}
}
@ -614,7 +610,6 @@ PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_
default:
JSON_G(error_code) = PHP_JSON_ERROR_UNSUPPORTED_TYPE;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "type is unsupported");
smart_str_appendl(buf, "null", 4);
break;
}
@ -754,11 +749,40 @@ static PHP_FUNCTION(json_decode)
Returns the error code of the last json_decode(). */
static PHP_FUNCTION(json_last_error)
{
if (zend_parse_parameters_none() == FAILURE) {
zend_bool as_string = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &as_string) == FAILURE) {
return;
}
RETURN_LONG(JSON_G(error_code));
/* return error code (JSON_ERROR_* constants) */
if (!as_string) {
RETURN_LONG(JSON_G(error_code));
}
/* return error message (for debugging purposes) */
switch(JSON_G(error_code)) {
case PHP_JSON_ERROR_NONE:
RETURN_STRING("No error", 1);
case PHP_JSON_ERROR_DEPTH:
RETURN_STRING("Maximum stack depth exceeded", 1);
case PHP_JSON_ERROR_STATE_MISMATCH:
RETURN_STRING("State mismatch (invalid or malformed JSON)", 1);
case PHP_JSON_ERROR_CTRL_CHAR:
RETURN_STRING("Control character error, possibly incorrectly encoded", 1);
case PHP_JSON_ERROR_SYNTAX:
RETURN_STRING("Syntax error", 1);
case PHP_JSON_ERROR_UTF8:
RETURN_STRING("Malformed UTF-8 characters, possibly incorrectly encoded", 1);
case PHP_JSON_ERROR_RECURSION:
RETURN_STRING("Recursion detected", 1);
case PHP_JSON_ERROR_INF_OR_NAN:
RETURN_STRING("Inf and NaN cannot be JSON encoded", 1);
case PHP_JSON_ERROR_UNSUPPORTED_TYPE:
RETURN_STRING("Type is not supported", 1);
default:
RETURN_STRING("Unknown error", 1);
}
}
/* }}} */

10
ext/json/tests/003.phpt
View File

@ -10,11 +10,17 @@ $a[] = &$a;
var_dump($a);
echo "\n";
var_dump(json_encode($a));
var_dump(json_last_error());
var_dump(json_last_error(true));
echo "\n";
var_dump(json_encode($a, JSON_PARTIAL_OUTPUT_ON_ERROR));
var_dump(json_last_error());
var_dump(json_last_error(true));
echo "Done\n";
?>
@ -27,11 +33,11 @@ array(1) {
}
}
Warning: json_encode(): recursion detected in %s on line %d
bool(false)
int(6)
string(%d) "Recursion detected"
Warning: json_encode(): recursion detected in %s on line %d
string(8) "[[null]]"
int(6)
string(%d) "Recursion detected"
Done

10
ext/json/tests/004.phpt
View File

@ -10,11 +10,17 @@ $a->prop = $a;
var_dump($a);
echo "\n";
var_dump(json_encode($a));
var_dump(json_last_error());
var_dump(json_last_error(true));
echo "\n";
var_dump(json_encode($a, JSON_PARTIAL_OUTPUT_ON_ERROR));
var_dump(json_last_error());
var_dump(json_last_error(true));
echo "Done\n";
?>
@ -24,11 +30,11 @@ object(stdClass)#%d (1) {
*RECURSION*
}
Warning: json_encode(): recursion detected in %s on line %d
bool(false)
int(6)
string(%d) "Recursion detected"
Warning: json_encode(): recursion detected in %s on line %d
string(22) "{"prop":{"prop":null}}"
int(6)
string(%d) "Recursion detected"
Done

8
ext/json/tests/bug43941.phpt
View File

@ -14,15 +14,7 @@ echo "Done\n";
?>
--EXPECTF--
string(5) ""abc""
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
bool(false)
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
string(4) "null"
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
string(17) "[null,null,"abc"]"
Done

4
ext/json/tests/bug53946.phpt
View File

@ -12,9 +12,5 @@ var_dump(json_encode("ab\xE0", JSON_UNESCAPED_UNICODE));
--EXPECTF--
string(156) ""latin 1234 -\/ russian \u043c\u0430\u043c\u0430 \u043c\u044b\u043b\u0430 \u0440\u0430\u043c\u0443 specialchars \u0002 \b \n U+1D11E >\ud834\udd1e<""
string(100) ""latin 1234 -\/ russian мама мыла раму specialchars \u0002 \b \n U+1D11E >𝄞<""
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
bool(false)
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
bool(false)

17
ext/json/tests/bug54058.phpt
View File

@ -9,17 +9,20 @@ $bad_utf8 = quoted_printable_decode('=B0');
json_encode($bad_utf8);
var_dump(json_last_error());
var_dump(json_last_error(true));
$a = new stdclass;
$a->foo = quoted_printable_decode('=B0');
json_encode($a);
var_dump(json_last_error());
var_dump(json_last_error(true));
$b = new stdclass;
$b->foo = $bad_utf8;
$b->bar = 1;
json_encode($b);
var_dump(json_last_error());
var_dump(json_last_error(true));
$c = array(
'foo' => $bad_utf8,
@ -27,17 +30,15 @@ $c = array(
);
json_encode($c);
var_dump(json_last_error());
var_dump(json_last_error(true));
?>
--EXPECTF--
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
int(5)
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
int(5)
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
int(5)
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
int(5)
string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"

39
ext/json/tests/bug61537.phpt Normal file
View File

@ -0,0 +1,39 @@
--TEST--
Bug #61537 (json_encode() incorrectly truncates/discards information)
--SKIPIF--
<?php if (!extension_loaded("json")) print "skip"; ?>
--FILE--
<?php
$invalid_utf8 = "\x9f";
var_dump(json_encode($invalid_utf8));
var_dump(json_last_error(), json_last_error(true));
var_dump(json_encode($invalid_utf8, JSON_PARTIAL_OUTPUT_ON_ERROR));
var_dump(json_last_error(), json_last_error(true));
echo "\n";
$invalid_utf8 = "an invalid sequen\xce in the middle of a string";
var_dump(json_encode($invalid_utf8));
var_dump(json_last_error(), json_last_error(true));
var_dump(json_encode($invalid_utf8, JSON_PARTIAL_OUTPUT_ON_ERROR));
var_dump(json_last_error(), json_last_error(true));
?>
--EXPECTF--
bool(false)
int(5)
string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
string(4) "null"
int(5)
string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
bool(false)
int(5)
string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
string(4) "null"
int(5)
string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"

6
ext/json/tests/bug61978.phpt
View File

@ -31,17 +31,13 @@ class JsonTest2 implements JsonSerializable {
$obj1 = new JsonTest1();
var_dump(json_encode($obj1, JSON_PARTIAL_OUTPUT_ON_ERROR));
echo "\n==\n";
echo "==\n";
$obj2 = new JsonTest2();
var_dump(json_encode($obj2, JSON_PARTIAL_OUTPUT_ON_ERROR));
?>
--EXPECTF--
Warning: json_encode(): recursion detected in %s on line %d
string(44) "{"test":"123","me":{"test":"123","me":null}}"
==
Warning: json_encode(): recursion detected in %s on line %d
string(44) "{"test":"123","me":{"test":"123","me":null}}"

23
ext/json/tests/inf_nan_error.phpt
View File

@ -8,37 +8,36 @@ $inf = INF;
var_dump($inf);
var_dump(json_encode($inf));
var_dump(json_last_error());
var_dump(json_last_error(), json_last_error(true));
var_dump(json_encode($inf, JSON_PARTIAL_OUTPUT_ON_ERROR));
var_dump(json_last_error());
var_dump(json_last_error(), json_last_error(true));
echo "\n";
$nan = NAN;
var_dump($nan);
var_dump(json_encode($nan));
var_dump(json_last_error());
var_dump(json_last_error(), json_last_error(true));
var_dump(json_encode($nan, JSON_PARTIAL_OUTPUT_ON_ERROR));
var_dump(json_last_error());
var_dump(json_last_error(), json_last_error(true));
?>
--EXPECTF--
float(INF)
Warning: json_encode(): double INF does not conform to the JSON spec in %s on line %d
bool(false)
int(7)
Warning: json_encode(): double INF does not conform to the JSON spec in %s on line %d
string(34) "Inf and NaN cannot be JSON encoded"
string(1) "0"
int(7)
string(34) "Inf and NaN cannot be JSON encoded"
float(NAN)
Warning: json_encode(): double NAN does not conform to the JSON spec in %s on line %d
bool(false)
int(7)
Warning: json_encode(): double NAN does not conform to the JSON spec in %s on line %d
string(34) "Inf and NaN cannot be JSON encoded"
string(1) "0"
int(7)
string(34) "Inf and NaN cannot be JSON encoded"

2
ext/json/tests/json_encode_basic.phpt
View File

@ -150,8 +150,6 @@ string(4) "null"
-- Iteration 25 --
string(4) "null"
-- Iteration 26 --
Warning: json_encode(): type is unsupported in %s on line %d
bool(false)
-- Iteration 27 --
string(82) "{"MyInt":99,"MyFloat":123.45,"MyBool":true,"MyNull":null,"MyString":"Hello World"}"

10
ext/json/tests/unsupported_type_error.phpt
View File

@ -8,19 +8,17 @@ $resource = fopen(__FILE__, "r");
var_dump($resource);
var_dump(json_encode($resource));
var_dump(json_last_error());
var_dump(json_last_error(), json_last_error(true));
var_dump(json_encode($resource, JSON_PARTIAL_OUTPUT_ON_ERROR));
var_dump(json_last_error());
var_dump(json_last_error(), json_last_error(true));
?>
--EXPECTF--
resource(5) of type (stream)
Warning: json_encode(): type is unsupported in %s on line %d
bool(false)
int(8)
Warning: json_encode(): type is unsupported in %s on line %d
string(21) "Type is not supported"
string(4) "null"
int(8)
string(21) "Type is not supported"

2
main/php_version.h
View File

@ -5,4 +5,4 @@
#define PHP_RELEASE_VERSION 5
#define PHP_EXTRA_VERSION "-dev"
#define PHP_VERSION "5.4.5-dev"
#define PHP_VERSION_ID 50404
#define PHP_VERSION_ID 50405