aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2020-01-14 08:24:35 +0800
committerfanquake <fanquake@gmail.com>2020-01-14 08:53:34 +0800
commita4a93a0badb328c4e54c3ceb7cc29a740bce5e43 (patch)
treec37a8c1722a432d77f0b5a586b6ef071c623dd74
parent2ed74a43a05a47129d56117deeb489addbcaf05f (diff)
parent8313fa8e8112e429e104b7e7fd48e5e6e359b82e (diff)
downloadbitcoin-a4a93a0badb328c4e54c3ceb7cc29a740bce5e43.tar.xz
Merge #17906: gui: Set CConnman byte counters earlier to avoid uninitialized reads
8313fa8e8112e429e104b7e7fd48e5e6e359b82e gui: Set CConnman byte counters earlier to avoid uninitialized reads (Russell Yanofsky) Pull request description: Initialize CConnman byte counters during construction, so GetTotalBytesRecv() and GetTotalBytesSent() methods don't return garbage before Start() is called. Change shouldn't have any effect outside of the GUI. It just fixes a race condition during a qt test that was observed on travis: https://travis-ci.org/bitcoin/bitcoin/jobs/634989685 ACKs for top commit: MarcoFalke: ACK 8313fa8e8112e429e104b7e7fd48e5e6e359b82e promag: ACK 8313fa8e8112e429e104b7e7fd48e5e6e359b82e. Tree-SHA512: 97c246da4e28e6e0b48f685b840f96746ad75c4b157a692201c6c4702db328a88ead8507d8e1b4e608aa1882513174ec60cf3977c31b7a9d76678cc9f49b45f8
-rw-r--r--src/net.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net.h b/src/net.h
index 9cd3b769ec..a69c68e43a 100644
--- a/src/net.h
+++ b/src/net.h
@@ -386,8 +386,8 @@ private:
// Network usage totals
CCriticalSection cs_totalBytesRecv;
CCriticalSection cs_totalBytesSent;
- uint64_t nTotalBytesRecv GUARDED_BY(cs_totalBytesRecv);
- uint64_t nTotalBytesSent GUARDED_BY(cs_totalBytesSent);
+ uint64_t nTotalBytesRecv GUARDED_BY(cs_totalBytesRecv) {0};
+ uint64_t nTotalBytesSent GUARDED_BY(cs_totalBytesSent) {0};
// outbound limit & stats
uint64_t nMaxOutboundTotalBytesSentInCycle GUARDED_BY(cs_totalBytesSent);