- Fixed bug #51590 (JSON_ERROR_UTF8 is undefined)

diff --git a/NEWS b/NEWS
index 744631d9da1ceb830b5ab4e0f52f8c6a8f113c40..51a6f16355fa6738352a223f93f1189d158d501e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,8 @@ PHP                                                                        NEWS
 - Fixed a NULL pointer dereference when processing invalid XML-RPC
   requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
 
-- Fixed Bug #51577 (Uninitialized memory reference with oci_bind_array_by_name)
+- Fixed bug #51590 (JSON_ERROR_UTF8 is undefined). (Felipe)
+- Fixed bug #51577 (Uninitialized memory reference with oci_bind_array_by_name)
   (Oracle Corp.)
 - Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection). (Felipe)
 - Fixed bug #51394 (Error line reported incorrectly if error handler throws an 

diff --git a/ext/json/json.c b/ext/json/json.c
index 5d166f0a3e07349fb0b11a7fa3a3620c0a8c9d55..6916b5375a113d7acf9733d47098adeb0edc8956 100644 (file)
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -87,6 +87,7 @@ static PHP_MINIT_FUNCTION(json)
        REGISTER_LONG_CONSTANT("JSON_ERROR_STATE_MISMATCH", PHP_JSON_ERROR_STATE_MISMATCH, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("JSON_ERROR_CTRL_CHAR", PHP_JSON_ERROR_CTRL_CHAR, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("JSON_ERROR_SYNTAX", PHP_JSON_ERROR_SYNTAX, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("JSON_ERROR_UTF8", PHP_JSON_ERROR_UTF8, CONST_CS | CONST_PERSISTENT);
 
        return SUCCESS;
 }