Fix bug #73526 (php_json_encode depth issue)

diff --git a/NEWS b/NEWS
index 3fe30bb30b21d9793b914894ed4701ca47180f28..eeb9f58ad386b556ea47dbc474eb7b1ca27f2a97 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,9 @@ PHP                                                                        NEWS
     This may be enabled again using envirionment variable USE_ZEND_DTRACE=1.
     (Dmitry)
 
+- JSON:
+  . Fixed bug #73526 (php_json_encode depth issue). (Jakub Zelenka)
+
 - Mysqlnd:
   . Fixed bug #64526 (Add missing mysqlnd.* parameters to php.ini-*). (cmb)
 

diff --git a/ext/json/json.c b/ext/json/json.c
index 61445ee114a33e1e3d359620229168c94ece64bc..a58cb31275d4c091b37aa699e89a8e3ee3914ef3 100644 (file)
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -148,7 +148,7 @@ static PHP_GINIT_FUNCTION(json)
 #endif
        json_globals->encoder_depth = 0;
        json_globals->error_code = 0;
-       json_globals->encode_max_depth = 0;
+       json_globals->encode_max_depth = PHP_JSON_PARSER_DEFAULT_DEPTH;
 }
 /* }}} */