Permalink
Browse files

fix nesting checks

  • Loading branch information...
jacob1 committed Jul 15, 2017
1 parent 6efedcd commit 08ba035a530b4003adebe14732f011a8c1e38ad0
Showing with 12 additions and 2 deletions.
  1. +12 −2 src/client/GameSave.cpp
@@ -2395,7 +2395,12 @@ std::set<int> GetNestedSaveIDs(Json::Value j)
{
for (Json::Value::ArrayIndex i = 0; i < j[member].size(); i++)
{
// only supports objects here because that is all we need
// only supports objects and ints here because that is all we need
if (j[member][i].isInt())
{
saveIDs.insert(j[member][i].asInt());
continue;
}
if (!j[member][i].isObject())
continue;
std::set<int> nestedSaveIDs = GetNestedSaveIDs(j[member][i]);
@@ -2427,7 +2432,12 @@ void GameSave::ConvertJsonToBson(bson *b, Json::Value j, int depth)
std::set<int> saveIDs = std::set<int>();
for (Json::Value::ArrayIndex i = 0; i < j[member].size(); i++)
{
// only supports objects here because that is all we need
// only supports objects and ints here because that is all we need
if (j[member][i].isInt())
{
saveIDs.insert(j[member][i].asInt());
continue;
}
if (!j[member][i].isObject())
continue;
if (depth > 4)

0 comments on commit 08ba035

Please sign in to comment.