Skip to content
Permalink
Browse files

Add maximum recursion depth to read_json_value

  • Loading branch information
ShadowNinja committed Jan 11, 2014
1 parent a9df87e commit a3586cd18d5a6182a578dc08a6dbc23e16df4c14
Showing with 7 additions and 3 deletions.
  1. +5 −2 src/script/common/c_content.cpp
  2. +2 −1 src/script/common/c_content.h
@@ -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);
@@ -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[];

0 comments on commit a3586cd

Please sign in to comment.