From: Jakub Zelenka <bukka@php.net>
Date: Sun, 20 Nov 2016 20:36:03 +0000 (+0000)
Subject: Fix bug #73526 (php_json_encode depth issue)
X-Git-Tag: php-7.0.14RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60574ea1ac4790abe818c2c7510d0e391c12c06a;p=php

Fix bug #73526 (php_json_encode depth issue)
---

diff --git a/NEWS b/NEWS
index 3fe30bb30b..eeb9f58ad3 100644
--- 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 61445ee114..a58cb31275 100644
--- 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;
 }
 /* }}} */