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

enforce ep3 map list size limit at startup time

Browse Source
This commit is contained in:
Martin Michelsen
2023-02-28 22:56:23 -08:00
parent fe5a15a1ab
commit a485c25eb8
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Episode3/DataIndex.cc
+9 -2
View File
@@ -1451,6 +1451,9 @@ DataIndex::DataIndex(const string& directory, uint32_t behavior_flags)
add_maps_from_dir(directory + "/maps-free", false); add_maps_from_dir(directory + "/maps-free", false);
add_maps_from_dir(directory + "/maps-quest", true); add_maps_from_dir(directory + "/maps-quest", true);
// Generate (and cache) the map list to ensure it's not too large
this->get_compressed_map_list();
try { try {
auto json = JSONObject::parse(load_file(directory + "/com-decks.json")); auto json = JSONObject::parse(load_file(directory + "/com-decks.json"));
for (const auto& def_json : json->as_list()) { for (const auto& def_json : json->as_list()) {
@@ -1573,8 +1576,12 @@ const string& DataIndex::get_compressed_map_list() const {
compressed_w.put_u32b(prs.input_size()); compressed_w.put_u32b(prs.input_size());
compressed_w.write(prs.close()); compressed_w.write(prs.close());
this->compressed_map_list = move(compressed_w.str()); this->compressed_map_list = move(compressed_w.str());
static_game_data_log.info("Generated Episode 3 compressed map list (%zu -> %zu bytes)", if (this->compressed_map_list.size() > 0x7BEC) {
this->compressed_map_list.size(), this->compressed_map_list.size()); throw runtime_error("Episode 3 compressed map list is too large");
}
size_t decompressed_size = sizeof(header) + entries_w.size() + strings_w.size();
static_game_data_log.info("Generated Episode 3 compressed map list (0x%zX -> 0x%zX bytes)",
decompressed_size, this->compressed_map_list.size());
} }
return this->compressed_map_list; return this->compressed_map_list;
} }