diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-01-06 21:10:30 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-01-06 21:10:30 -0500 |
| commit | e3acd3e6ba13eb661ecf2249273d41af982634c4 (patch) | |
| tree | 0b354eba56402db146ad657738652667fe379d91 /contrib/epee | |
| parent | Merge pull request #7266 (diff) | |
| parent | Restrict duplicate keys in epee binary format (diff) | |
| download | monero-e3acd3e6ba13eb661ecf2249273d41af982634c4.tar.xz | |
Merge pull request #7278
187b4d7 Restrict duplicate keys in epee binary format (Lee Clagett)
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 |