incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make tournament state parsing more robust

Browse Source
This commit is contained in:
Martin Michelsen
2023-09-06 09:46:28 -07:00
parent d2a589d968
commit 75fab887e1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Episode3/Tournament.cc
+2 -2
View File
@@ -661,10 +661,10 @@ TournamentIndex::TournamentIndex(
} }
auto json = JSON::parse(load_file(this->state_filename)); auto json = JSON::parse(load_file(this->state_filename));
if (json.size() != 0x20) { if (json.size() > 0x20) {
throw runtime_error("tournament JSON list length is incorrect"); throw runtime_error("tournament JSON list length is incorrect");
} }
for (size_t z = 0; z < 0x20; z++) { for (size_t z = 0; z < min<size_t>(json.size(), 0x20); z++) {
if (!json.at(z).is_null()) { if (!json.at(z).is_null()) {
this->tournaments[z].reset(new Tournament(this->map_index, this->com_deck_index, z, json.at(z))); this->tournaments[z].reset(new Tournament(this->map_index, this->com_deck_index, z, json.at(z)));
this->tournaments[z]->init(); this->tournaments[z]->init();