diff options
| -rw-r--r-- | contrib/epee/include/storages/portable_storage_from_bin.h | 2 | ||||
| -rw-r--r-- | src/cryptonote_basic/connection_context.h | 2 |
2 files changed, 1 insertions, 3 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 diff --git a/src/cryptonote_basic/connection_context.h b/src/cryptonote_basic/connection_context.h index a735ae06b..9e012f8f5 100644 --- a/src/cryptonote_basic/connection_context.h +++ b/src/cryptonote_basic/connection_context.h @@ -44,7 +44,7 @@ namespace cryptonote cryptonote_connection_context(): m_state(state_before_handshake), m_remote_blockchain_height(0), m_last_response_height(0), m_last_request_time(boost::date_time::not_a_date_time), m_callback_request_count(0), m_last_known_hash(crypto::null_hash), m_pruning_seed(0), m_rpc_port(0), m_rpc_credits_per_hash(0), m_anchor(false), m_score(0), - m_expect_response(0), m_num_requested(0) {} + m_expect_response(0), m_expect_height(0), m_num_requested(0) {} enum state { |