From 8e2caf3fb4101483af8ffbe1e5996bcc372b8c53 Mon Sep 17 00:00:00 2001 From: moneromooo Date: Thu, 31 Dec 2020 16:27:27 +0000 Subject: portable_storage: check object limit where appropriate also fix pedantic off by one in check --- contrib/epee/include/storages/portable_storage_from_bin.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'contrib/epee/include/storages') diff --git a/contrib/epee/include/storages/portable_storage_from_bin.h b/contrib/epee/include/storages/portable_storage_from_bin.h index eb0eed235..1d6a09c41 100644 --- a/contrib/epee/include/storages/portable_storage_from_bin.h +++ b/contrib/epee/include/storages/portable_storage_from_bin.h @@ -163,6 +163,11 @@ namespace epee array_entry_t sa; size_t size = read_varint(); CHECK_AND_ASSERT_THROW_MES(size <= m_count / ps_min_bytes::strict, "Size sanity check failed"); + if (std::is_same()) + { + CHECK_AND_ASSERT_THROW_MES(size <= EPEE_PORTABLE_STORAGE_OBJECT_LIMIT_INTERNAL - m_objects, "Too many objects"); + m_objects += size; + } sa.reserve(size); //TODO: add some optimization here later @@ -288,7 +293,7 @@ namespace epee RECURSION_LIMITATION(); sec.m_entries.clear(); size_t count = read_varint(); - CHECK_AND_ASSERT_THROW_MES(count < EPEE_PORTABLE_STORAGE_OBJECT_LIMIT_INTERNAL - m_objects, "Too many objects"); + CHECK_AND_ASSERT_THROW_MES(count <= EPEE_PORTABLE_STORAGE_OBJECT_LIMIT_INTERNAL - m_objects, "Too many objects"); m_objects += count; while(count--) { -- cgit v1.2.3