From 64c371142cbdb82eb0879d247430797d73a8ac2d Mon Sep 17 00:00:00 2001 From: Jakub Zelenka Date: Sun, 28 Jun 2015 17:16:12 +0100 Subject: Fix bug #62010 (json_decode produces invalid byte-sequences) --- ext/json/json.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ext/json/json.c') diff --git a/ext/json/json.c b/ext/json/json.c index 8088a89b4e..79b9278513 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -122,6 +122,7 @@ static PHP_MINIT_FUNCTION(json) REGISTER_LONG_CONSTANT("JSON_ERROR_INF_OR_NAN", PHP_JSON_ERROR_INF_OR_NAN, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("JSON_ERROR_UNSUPPORTED_TYPE", PHP_JSON_ERROR_UNSUPPORTED_TYPE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("JSON_ERROR_INVALID_PROPERTY_NAME", PHP_JSON_ERROR_INVALID_PROPERTY_NAME, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("JSON_ERROR_UTF16", PHP_JSON_ERROR_UTF16, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("JSON_OBJECT_AS_ARRAY", PHP_JSON_OBJECT_AS_ARRAY, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("JSON_BIGINT_AS_STRING", PHP_JSON_BIGINT_AS_STRING, CONST_CS | CONST_PERSISTENT); @@ -303,6 +304,8 @@ static PHP_FUNCTION(json_last_error_msg) RETURN_STRING("Type is not supported"); case PHP_JSON_ERROR_INVALID_PROPERTY_NAME: RETURN_STRING("The decoded property name is invalid"); + case PHP_JSON_ERROR_UTF16: + RETURN_STRING("Single unpaired UTF-16 surrogate in unicode escape"); default: RETURN_STRING("Unknown error"); } -- cgit v1.2.1