4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-14 12:26:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed issues found by static analysis

Browse Source 
- rolling_median: tried to free uninitialized pointer in a constructor
- net_node.inl: erase-remove idiom was used incorrectly. remove_if doesn't actually remove elements, see http://cpp.sh/6fcjv
- bulletproofs.cc: call to sizeof() instead of vector.size(), luckily it only impacts performance and not code logic there
This commit is contained in:
SChernykh 2020-12-08 18:27:19 +01:00
parent b7425c14c8
commit c0c75ac19d
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/epee/include/rolling_median.h
View File

@ -141,7 +141,6 @@ public:
rolling_median_t(rolling_median_t &&m) rolling_median_t(rolling_median_t &&m)
{ {
free(data);
memcpy(this, &m, sizeof(rolling_median_t)); memcpy(this, &m, sizeof(rolling_median_t));
m.data = NULL; m.data = NULL;
} }

8
src/p2p/net_node.inl
View File

@ -2830,8 +2830,8 @@ namespace nodetool
const uint32_t index = stripe - 1; const uint32_t index = stripe - 1;
CRITICAL_REGION_LOCAL(m_used_stripe_peers_mutex); CRITICAL_REGION_LOCAL(m_used_stripe_peers_mutex);
MINFO("adding stripe " << stripe << " peer: " << context.m_remote_address.str()); 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(), 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; }); [&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); m_used_stripe_peers[index].push_back(context.m_remote_address);
} }
@ -2844,8 +2844,8 @@ namespace nodetool
const uint32_t index = stripe - 1; const uint32_t index = stripe - 1;
CRITICAL_REGION_LOCAL(m_used_stripe_peers_mutex); CRITICAL_REGION_LOCAL(m_used_stripe_peers_mutex);
MINFO("removing stripe " << stripe << " peer: " << context.m_remote_address.str()); 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(), 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; }); [&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> template<class t_payload_net_handler>

2
src/ringct/bulletproofs.cc
View File

@ -826,7 +826,7 @@ bool bulletproof_VERIFY(const std::vector<const Bulletproof*> &proofs)
proof_data.reserve(proofs.size()); proof_data.reserve(proofs.size());
size_t inv_offset = 0; size_t inv_offset = 0;
std::vector<rct::key> to_invert; std::vector<rct::key> to_invert;
to_invert.reserve(11 * sizeof(proofs)); to_invert.reserve(11 * proofs.size());
size_t max_logM = 0; size_t max_logM = 0;
for (const Bulletproof *p: proofs) for (const Bulletproof *p: proofs)
{ {