diff --git a/NEWS b/NEWS index b655a47a6f15..4025b2da13f7 100644 --- a/NEWS +++ b/NEWS @@ -52,6 +52,9 @@ PHP NEWS . Fixed stack overflow in filter_var() and filter_var_array() with deeply nested arrays. (Eyüp Can Akman) +- JSON: + . Fixed json_decode() and json_validate() error messages. (lacatoire) + - MBString: . Fixed stack overflow in mb_check_encoding() and mb_convert_encoding() with deeply nested arrays. (Eyüp Can Akman) diff --git a/ext/json/json.c b/ext/json/json.c index 0b42187491ff..3ff83e9009ba 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -296,7 +296,7 @@ PHP_FUNCTION(json_decode) } if (depth > INT_MAX) { - zend_argument_value_error(3, "must be less than %d", INT_MAX); + zend_argument_value_error(3, "must be less than or equal to %d", INT_MAX); RETURN_THROWS(); } @@ -347,7 +347,7 @@ PHP_FUNCTION(json_validate) } if (depth > INT_MAX) { - zend_argument_value_error(2, "must be less than %d", INT_MAX); + zend_argument_value_error(2, "must be less than or equal to %d", INT_MAX); RETURN_THROWS(); } diff --git a/ext/json/tests/bug72787.phpt b/ext/json/tests/bug72787.phpt index c08bd18ec9b1..4c2f8d62c5db 100644 --- a/ext/json/tests/bug72787.phpt +++ b/ext/json/tests/bug72787.phpt @@ -13,4 +13,4 @@ try { ?> --EXPECTF-- -json_decode(): Argument #3 ($depth) must be less than %d +json_decode(): Argument #3 ($depth) must be less than or equal to %d diff --git a/ext/json/tests/json_validate_003.phpt b/ext/json/tests/json_validate_003.phpt index cd0545b9a7f9..faad350b4e93 100644 --- a/ext/json/tests/json_validate_003.phpt +++ b/ext/json/tests/json_validate_003.phpt @@ -14,6 +14,6 @@ try { ?> --EXPECTF-- -json_validate(): Argument #2 ($depth) must be less than %d +json_validate(): Argument #2 ($depth) must be less than or equal to %d int(0) string(8) "No error"