From: ShadowNinja <shadowninja@minetest.net>
Date: Sat, 11 Jan 2014 19:08:02 +0000 (-0500)
Subject: Add maximum recursion depth to read_json_value
X-Git-Tag: 0.4.10~323
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a3586cd18d5a6182a578dc08a6dbc23e16df4c14;p=oweals%2Fminetest.git

Add maximum recursion depth to read_json_value
---

diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 962391a04..c4acb7c32 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -1088,8 +1088,11 @@ bool push_json_value(lua_State *L, const Json::Value &value, int nullindex)
 }
 
 // Converts Lua table --> JSON
-void read_json_value(lua_State *L, Json::Value &root, int index)
+void read_json_value(lua_State *L, Json::Value &root, int index, u8 recursion)
 {
+	if (recursion > 16) {
+		throw SerializationError("Maximum recursion depth exceeded");
+	}
 	int type = lua_type(L, index);
 	if (type == LUA_TBOOLEAN) {
 		root = (bool) lua_toboolean(L, index);
@@ -1104,7 +1107,7 @@ void read_json_value(lua_State *L, Json::Value &root, int index)
 		while (lua_next(L, index)) {
 			// Key is at -2 and value is at -1
 			Json::Value value;
-			read_json_value(L, value, lua_gettop(L));
+			read_json_value(L, value, lua_gettop(L), recursion + 1);
 
 			Json::ValueType roottype = root.type();
 			int keytype = lua_type(L, -1);
diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
index c2d84ac11..163e803db 100644
--- a/src/script/common/c_content.h
+++ b/src/script/common/c_content.h
@@ -152,7 +152,8 @@ bool               push_json_value           (lua_State *L,
                                               int nullindex);
 void               read_json_value           (lua_State *L,
                                               Json::Value &root,
-                                              int index);
+                                              int index,
+                                              u8 recursion = 0);
 
 extern struct EnumString es_TileAnimationType[];