Fix bug #73526 (php_json_encode depth issue)

bukka · bukka · commit 60574ea1ac47 · 2016-11-20T20:36:03.000Z
diff --git 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
@@ -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;
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ static PHP_GINIT_FUNCTION(json)`
`148`	`148`	`#endif`
`149`	`149`	`json_globals->encoder_depth = 0;`
`150`	`150`	`json_globals->error_code = 0;`
`151`		`- json_globals->encode_max_depth = 0;`
	`151`	`+ json_globals->encode_max_depth = PHP_JSON_PARSER_DEFAULT_DEPTH;`
`152`	`152`	`}`
`153`	`153`	`/* }}} */`
`154`	`154`