diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-12-28 21:04:11 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-12-28 21:05:12 +0000 |
| commit | b39ee13d707c4cdcf4bc9f570153e332f9884d1a (patch) | |
| tree | 1a337d5e2fb3b372b6f4953e254309119eed9082 | |
| parent | Merge pull request #7193 (diff) | |
| download | monero-b39ee13d707c4cdcf4bc9f570153e332f9884d1a.tar.xz | |
portable_storage: remove array element limit
some people don't want it
| -rw-r--r-- | contrib/epee/include/storages/portable_storage_from_bin.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/contrib/epee/include/storages/portable_storage_from_bin.h b/contrib/epee/include/storages/portable_storage_from_bin.h index f92546823..eb0eed235 100644 --- a/contrib/epee/include/storages/portable_storage_from_bin.h +++ b/contrib/epee/include/storages/portable_storage_from_bin.h @@ -38,7 +38,6 @@ #define EPEE_PORTABLE_STORAGE_RECURSION_LIMIT_INTERNAL 100 #endif #define EPEE_PORTABLE_STORAGE_OBJECT_LIMIT_INTERNAL 65536 -#define EPEE_PORTABLE_STORAGE_ARRAY_ELEMENT_LIMIT_INTERNAL 65536 namespace epee { @@ -105,7 +104,6 @@ namespace epee size_t m_count; size_t m_recursion_count; size_t m_objects; - size_t m_array_elements; }; inline throwable_buffer_reader::throwable_buffer_reader(const void* ptr, size_t sz) @@ -118,7 +116,6 @@ namespace epee m_count = sz; m_recursion_count = 0; m_objects = 0; - m_array_elements = 0; } inline void throwable_buffer_reader::read(void* target, size_t count) @@ -165,8 +162,6 @@ namespace epee //for pod types array_entry_t<type_name> sa; size_t size = read_varint(); - 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"); sa.reserve(size); |