diff options
| author | Lee Clagett <code@leeclagett.com> | 2020-12-31 20:40:50 -0500 |
|---|---|---|
| committer | Lee Clagett <code@leeclagett.com> | 2020-12-20 03:47:32 +0000 |
| commit | 187b4d75216c136729b0c4b3baaa66c2375032d0 (patch) | |
| tree | bc2254b2e3ef5ffbea703cd9fe8881b93803f899 /contrib/epee | |
| parent | Merge pull request #7271 (diff) | |
| download | monero-187b4d75216c136729b0c4b3baaa66c2375032d0.tar.xz | |
Restrict duplicate keys in epee binary format
Diffstat (limited to 'contrib/epee')
| -rw-r--r-- | contrib/epee/include/storages/portable_storage_from_bin.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/epee/include/storages/portable_storage_from_bin.h b/contrib/epee/include/storages/portable_storage_from_bin.h index dfd815f97..5091a3c5f 100644 --- a/contrib/epee/include/storages/portable_storage_from_bin.h +++ b/contrib/epee/include/storages/portable_storage_from_bin.h @@ -29,6 +29,7 @@ #pragma once #include "misc_language.h" +#include "misc_log_ex.h" #include "portable_storage_base.h" #include "portable_storage_bin_utils.h" @@ -306,7 +307,9 @@ namespace epee //read section name string std::string sec_name; read_sec_name(sec_name); - sec.m_entries.emplace(std::move(sec_name), load_storage_entry()); + const auto insert_loc = sec.m_entries.lower_bound(sec_name); + CHECK_AND_ASSERT_THROW_MES(insert_loc == sec.m_entries.end() || insert_loc->first != sec_name, "duplicate key: " << sec_name); + sec.m_entries.emplace_hint(insert_loc, std::move(sec_name), load_storage_entry()); } } inline |