diff options
| author | Alexander Blair <snipa@jagtech.io> | 2021-01-01 22:44:02 -0800 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2021-01-01 22:44:02 -0800 |
| commit | f4e34d50cff92561ff80d019d5f0f8dfdc56b97d (patch) | |
| tree | acc1dd0c30ebe60f0dc1784135ce11e5c2e3d29b /contrib | |
| parent | Merge pull request #7247 (diff) | |
| parent | portable_storage: forbid unnamed sections (diff) | |
| download | monero-f4e34d50cff92561ff80d019d5f0f8dfdc56b97d.tar.xz | |
Merge pull request #7249
cb296b39b portable_storage: forbid unnamed sections (xiphon)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/include/storages/portable_storage.h | 1 | ||||
| -rw-r--r-- | contrib/epee/include/storages/portable_storage_from_bin.h | 1 | ||||
| -rw-r--r-- | contrib/epee/include/storages/portable_storage_to_bin.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h index 4b759a24f..634af2d4e 100644 --- a/contrib/epee/include/storages/portable_storage.h +++ b/contrib/epee/include/storages/portable_storage.h @@ -282,6 +282,7 @@ namespace epee static_assert(std::is_rvalue_reference<entry_type&&>(), "unexpected copy of value"); TRY_ENTRY(); CHECK_AND_ASSERT(psection, nullptr); + CHECK_AND_ASSERT(!pentry_name.empty(), nullptr); auto ins_res = psection->m_entries.emplace(pentry_name, std::forward<entry_type>(entry)); return &ins_res.first->second; CATCH_ENTRY("portable_storage::insert_new_entry_get_storage_entry", nullptr); diff --git a/contrib/epee/include/storages/portable_storage_from_bin.h b/contrib/epee/include/storages/portable_storage_from_bin.h index 1d6a09c41..631ad307b 100644 --- a/contrib/epee/include/storages/portable_storage_from_bin.h +++ b/contrib/epee/include/storages/portable_storage_from_bin.h @@ -132,6 +132,7 @@ namespace epee RECURSION_LIMITATION(); uint8_t name_len = 0; read(name_len); + CHECK_AND_ASSERT_THROW_MES(name_len > 0, "Section name is missing"); sce_name.resize(name_len); read((void*)sce_name.data(), name_len); } diff --git a/contrib/epee/include/storages/portable_storage_to_bin.h b/contrib/epee/include/storages/portable_storage_to_bin.h index 137497e19..49a7be185 100644 --- a/contrib/epee/include/storages/portable_storage_to_bin.h +++ b/contrib/epee/include/storages/portable_storage_to_bin.h @@ -211,6 +211,7 @@ namespace epee for(const section_pair& se: sec.m_entries) { CHECK_AND_ASSERT_THROW_MES(se.first.size() < std::numeric_limits<uint8_t>::max(), "storage_entry_name is too long: " << se.first.size() << ", val: " << se.first); + CHECK_AND_ASSERT_THROW_MES(!se.first.empty(), "storage_entry_name is empty"); uint8_t len = static_cast<uint8_t>(se.first.size()); strm.write((const char*)&len, sizeof(len)); strm.write(se.first.data(), size_t(len)); |