aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Yanofsky <russ@yanofsky.org>2020-01-10 14:55:10 -0500
committerRussell Yanofsky <russ@yanofsky.org>2020-01-10 14:55:10 -0500
commit8313fa8e8112e429e104b7e7fd48e5e6e359b82e (patch)
treeb2927e1cfe224195bfcd39f97c673482de353597
parente7f84503571c171a7e6728cd2d77dd4103bd7a6f (diff)
downloadbitcoin-8313fa8e8112e429e104b7e7fd48e5e6e359b82e.tar.xz
gui: Set CConnman byte counters earlier to avoid uninitialized reads
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
-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);