Merge pull request #7251

f0b867b13 Restrict duplicate keys in epee binary format (Lee Clagett)
3 years ago · 2107337999
parent f4e34d50cf f0b867b13d
commit 2107337999
1 changed files with 3 additions and 1 deletions
--- a/contrib/epee/include/storages/portable_storage_from_bin.h
+++ b/contrib/epee/include/storages/portable_storage_from_bin.h
@ -301,7 +301,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