diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-11-20 20:36:03 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-11-20 20:36:03 +0000 |
| commit | 60574ea1ac4790abe818c2c7510d0e391c12c06a (patch) | |
| tree | 844c5a979fcb765c3eae1c0e8dc7d38102fcfe47 | |
| parent | 685b1292e9a050ec413662c4b7dcf69030d2010c (diff) | |
| download | php-git-60574ea1ac4790abe818c2c7510d0e391c12c06a.tar.gz | |
Fix bug #73526 (php_json_encode depth issue)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/json/json.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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; } /* }}} */ |