From: Scott MacVicar <scottmac@php.net>
Date: Thu, 14 May 2009 00:13:57 +0000 (+0000)
Subject: Allow the json_decode() depth to be any size, but keep the static one around for... 
X-Git-Tag: php-5.4.0alpha1~191^2~3672
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c1ba8cc0602103ca735f4d4aededa812fb1bb91;p=php

Allow the json_decode() depth to be any size, but keep the static one around for now. It might make sense to allow an unbound depth.
---

diff --git a/ext/json/JSON_parser.c b/ext/json/JSON_parser.c
index 9bc6d9d1aa..1b2e22b81e 100644
--- a/ext/json/JSON_parser.c
+++ b/ext/json/JSON_parser.c
@@ -247,6 +247,11 @@ new_JSON_parser(int depth)
     jp->top = -1;
 	jp->error_code = PHP_JSON_ERROR_NONE;
     jp->stack = (int*)ecalloc(depth, sizeof(int));
+    if (depth > JSON_PARSER_DEFAULT_DEPTH) {
+        jp->the_zstack = (zval **)safe_emalloc(depth, sizeof(zval), 0);
+    } else {
+        jp->the_zstack = &jp->the_static_zstack[0];
+    }
     push(jp, MODE_DONE);
     return jp;
 }
@@ -258,6 +263,9 @@ int
 free_JSON_parser(JSON_parser jp)
 {
     efree((void*)jp->stack);
+    if (jp->the_zstack != &jp->the_static_zstack[0]) {
+        efree(jp->the_zstack);
+    }
     efree((void*)jp);
     return false;
 }
diff --git a/ext/json/JSON_parser.h b/ext/json/JSON_parser.h
index a4bc9e50c3..03be9ce990 100644
--- a/ext/json/JSON_parser.h
+++ b/ext/json/JSON_parser.h
@@ -6,7 +6,7 @@
 #include "php.h"
 #include "ext/standard/php_smart_str.h"
 
-#define JSON_PARSER_MAX_DEPTH 512
+#define JSON_PARSER_DEFAULT_DEPTH 512
 
 typedef struct JSON_parser_struct {
     int state;
@@ -14,8 +14,8 @@ typedef struct JSON_parser_struct {
     int top;
     int error_code;
     int* stack;
-    zval *the_zstack[JSON_PARSER_MAX_DEPTH];
-
+    zval **the_zstack;
+    zval *the_static_zstack[JSON_PARSER_DEFAULT_DEPTH];
 } * JSON_parser;
 
 enum error_codes {
diff --git a/ext/json/json.c b/ext/json/json.c
index a327838dcc..d9616ca7fd 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -507,7 +507,7 @@ static PHP_FUNCTION(json_decode)
 	int str_len, utf16_len;
 	zend_uchar str_type;
 	zend_bool assoc = 0; /* return JS objects as PHP objects by default */
-	long depth = JSON_PARSER_MAX_DEPTH;
+	long depth = JSON_PARSER_DEFAULT_DEPTH;
 	zval *z;
 	unsigned short *utf16;
 	JSON_parser jp;
@@ -535,9 +535,8 @@ static PHP_FUNCTION(json_decode)
 		}
 	}
 
-	/* can be removed once we remove the max depth limit */
-	if (depth <= 0 || depth > JSON_PARSER_MAX_DEPTH) {
-		depth = JSON_PARSER_MAX_DEPTH;
+	if (depth <= 0) {
+		depth = JSON_PARSER_DEFAULT_DEPTH;
 	}
 
 	ALLOC_INIT_ZVAL(z);