Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7202 

bc97eb8a3 portable_storage: remove overly aggressive cutoff (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-12-28 11:38:46 -08:00
parent faaec08fa4 bc97eb8a33
commit b880860378
No known key found for this signature in database
GPG Key ID: C64552D877C32479
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/epee/include/storages/portable_storage_from_bin.h
View File

@ -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