diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-12-28 11:40:15 -0800 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-12-28 11:40:15 -0800 |
| commit | 75e9e7b39a8dfa0c9de8848dc2cec7cef689b155 (patch) | |
| tree | 602ac91c5ef1514e53212768074e916acd07c43e | |
| parent | Merge pull request #7197 (diff) | |
| parent | portable_storage: remove overly aggressive cutoff (diff) | |
| download | monero-75e9e7b39a8dfa0c9de8848dc2cec7cef689b155.tar.xz | |
Merge pull request #7203
0fc927dfb portable_storage: remove overly aggressive cutoff (moneromooo-monero)
| -rw-r--r-- | contrib/epee/include/storages/portable_storage_from_bin.h | 2 |
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 |