aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Blair <snipa@jagtech.io>2020-12-28 11:38:46 -0800
committerAlexander Blair <snipa@jagtech.io>2020-12-28 11:38:46 -0800
commitb8808603787473a08f016bd46ce273bc73e95c96 (patch)
treef24e2489f09af9b2b34f7aa861a6ccf0a2300ccb
parentfaaec08fa4cf7b09e68e30a09f51985b5a178859 (diff)
parentbc97eb8a33497e9302c77b03e9cb63f95a46a3fb (diff)
downloadmonzero-core-b8808603787473a08f016bd46ce273bc73e95c96.tar.gz
monzero-core-b8808603787473a08f016bd46ce273bc73e95c96.tar.xz
monzero-core-b8808603787473a08f016bd46ce273bc73e95c96.zip
Merge pull request #7202
bc97eb8a3 portable_storage: remove overly aggressive cutoff (moneromooo-monero)
-rw-r--r--contrib/epee/include/storages/portable_storage_from_bin.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/contrib/epee/include/storages/portable_storage_from_bin.h b/contrib/epee/include/storages/portable_storage_from_bin.h
index 20c2bc124..f92546823 100644
--- a/contrib/epee/include/storages/portable_storage_from_bin.h
+++ b/contrib/epee/include/storages/portable_storage_from_bin.h
@@ -168,8 +168,6 @@ namespace epee
CHECK_AND_ASSERT_THROW_MES(size < EPEE_PORTABLE_STORAGE_ARRAY_ELEMENT_LIMIT_INTERNAL - m_array_elements, "Too many array elements");
m_array_elements += size;
CHECK_AND_ASSERT_THROW_MES(size <= m_count / ps_min_bytes<type_name>::strict, "Size sanity check failed");
- const size_t threshold = 16384 - std::min<size_t>(m_array_elements, 16384);
- CHECK_AND_ASSERT_THROW_MES(size <= threshold || size <= m_count / ps_min_bytes<type_name>::rough, "Large array stricter size sanity check failed");
sa.reserve(size);
//TODO: add some optimization here later