Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

harden against some parsing exceptions

Browse Source 
(by disabling them, since the error case is already handled)
This commit is contained in:
Green Sky 2024-04-01 18:06:41 +02:00
parent 6d150ba441
commit 8d0518c2e3
No known key found for this signature in database
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fragment_store/fragment_store.cpp
View File

@ -722,7 +722,7 @@ size_t FragmentStore::scanStoragePath(std::string_view path) {
file.read(reinterpret_cast<char*>(full_meta_data.data()), full_meta_data.size()); file.read(reinterpret_cast<char*>(full_meta_data.data()), full_meta_data.size());
} }
const auto meta_header_j = nlohmann::json::from_msgpack(full_meta_data); const auto meta_header_j = nlohmann::json::from_msgpack(full_meta_data, true, false);
if (!meta_header_j.is_array() || meta_header_j.size() < 4) { if (!meta_header_j.is_array() || meta_header_j.size() < 4) {
std::cerr << "FS error: broken binary meta " << it.frag_path << "\n"; std::cerr << "FS error: broken binary meta " << it.frag_path << "\n";
@ -780,9 +780,9 @@ size_t FragmentStore::scanStoragePath(std::string_view path) {
// TODO: enc // TODO: enc
if (!meta_data_decomp.empty()) { if (!meta_data_decomp.empty()) {
j = nlohmann::json::from_msgpack(meta_data_decomp); j = nlohmann::json::from_msgpack(meta_data_decomp, true, false);
} else { } else {
j = nlohmann::json::from_msgpack(meta_data_ref); j = nlohmann::json::from_msgpack(meta_data_ref, true, false);
} }
} else if (it.meta_ext == ".meta.json") { } else if (it.meta_ext == ".meta.json") {
std::ifstream file(it.frag_path.generic_u8string() + it.meta_ext, std::ios::in | std::ios::binary); std::ifstream file(it.frag_path.generic_u8string() + it.meta_ext, std::ios::in | std::ios::binary);