matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix nesting checks

Browse Source
This commit is contained in:
jacob1 2017-07-15 16:27:11 -04:00
parent 6efedcdd33
commit 08ba035a53
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/client/GameSave.cpp
View File

@ -2395,7 +2395,12 @@ std::set<int> GetNestedSaveIDs(Json::Value j)
{ {
for (Json::Value::ArrayIndex i = 0; i < j[member].size(); i++) 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()) if (!j[member][i].isObject())
continue; continue;
std::set<int> nestedSaveIDs = GetNestedSaveIDs(j[member][i]); 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>(); std::set<int> saveIDs = std::set<int>();
for (Json::Value::ArrayIndex i = 0; i < j[member].size(); i++) 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()) if (!j[member][i].isObject())
continue; continue;
if (depth > 4) if (depth > 4)