diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-12-26 13:36:01 -0800 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-12-26 13:36:01 -0800 |
| commit | b9e444da5eee2dc2084d917dc9fd179c9bf33a3b (patch) | |
| tree | d4f9f703164ad52a08c76e9c1db51559ab3bfe9b /src | |
| parent | Merge pull request #7086 (diff) | |
| parent | Fixed issues found by static analysis (diff) | |
| download | monero-b9e444da5eee2dc2084d917dc9fd179c9bf33a3b.tar.xz | |
Merge pull request #7098
c0c75ac19 Fixed issues found by static analysis (SChernykh)
Diffstat (limited to 'src')
| -rw-r--r-- | src/p2p/net_node.inl | 8 | ||||
| -rw-r--r-- | src/ringct/bulletproofs.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index ab098b7d4..1d3e0de50 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -2834,8 +2834,8 @@ namespace nodetool const uint32_t index = stripe - 1; CRITICAL_REGION_LOCAL(m_used_stripe_peers_mutex); MINFO("adding stripe " << stripe << " peer: " << context.m_remote_address.str()); - std::remove_if(m_used_stripe_peers[index].begin(), m_used_stripe_peers[index].end(), - [&context](const epee::net_utils::network_address &na){ return context.m_remote_address == na; }); + m_used_stripe_peers[index].erase(std::remove_if(m_used_stripe_peers[index].begin(), m_used_stripe_peers[index].end(), + [&context](const epee::net_utils::network_address &na){ return context.m_remote_address == na; }), m_used_stripe_peers[index].end()); m_used_stripe_peers[index].push_back(context.m_remote_address); } @@ -2848,8 +2848,8 @@ namespace nodetool const uint32_t index = stripe - 1; CRITICAL_REGION_LOCAL(m_used_stripe_peers_mutex); MINFO("removing stripe " << stripe << " peer: " << context.m_remote_address.str()); - std::remove_if(m_used_stripe_peers[index].begin(), m_used_stripe_peers[index].end(), - [&context](const epee::net_utils::network_address &na){ return context.m_remote_address == na; }); + m_used_stripe_peers[index].erase(std::remove_if(m_used_stripe_peers[index].begin(), m_used_stripe_peers[index].end(), + [&context](const epee::net_utils::network_address &na){ return context.m_remote_address == na; }), m_used_stripe_peers[index].end()); } template<class t_payload_net_handler> diff --git a/src/ringct/bulletproofs.cc b/src/ringct/bulletproofs.cc index 359dfa879..a6e12c9b3 100644 --- a/src/ringct/bulletproofs.cc +++ b/src/ringct/bulletproofs.cc @@ -826,7 +826,7 @@ bool bulletproof_VERIFY(const std::vector<const Bulletproof*> &proofs) proof_data.reserve(proofs.size()); size_t inv_offset = 0; std::vector<rct::key> to_invert; - to_invert.reserve(11 * sizeof(proofs)); + to_invert.reserve(11 * proofs.size()); size_t max_logM = 0; for (const Bulletproof *p: proofs) { |