diff options
author | Ethan Heilman <ethan.r.heilman@gmail.com> | 2020-10-04 21:07:51 -0400 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2020-10-23 08:50:19 +0800 |
commit | 1f67a30e8374951997af924293c60eff56ae39ed (patch) | |
tree | 36acc6ff85cdc478f4a117e4c5f72a3c50b144d8 /src | |
parent | 6113b547f4cce8be732bf45687a74eccf4a3abfc (diff) | |
download | bitcoin-1f67a30e8374951997af924293c60eff56ae39ed.tar.xz |
random: fixes read buffer resizing in RandAddSeedPerfmon
+ Replaces std::max with std::min to resize buffer in RandAddSeedPerfmon
+ Documents behavior of RandAddSeedPerfmon
Github-Pull: #20082
Rebased-From: bd5215103eb3985c1622eddea45a040e6173829c
Diffstat (limited to 'src')
-rw-r--r-- | src/randomenv.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/randomenv.cpp b/src/randomenv.cpp index 8b3d478529..d04f80d06a 100644 --- a/src/randomenv.cpp +++ b/src/randomenv.cpp @@ -67,7 +67,8 @@ void RandAddSeedPerfmon(CSHA512& hasher) #ifdef WIN32 // Seed with the entire set of perfmon data - // This can take up to 2 seconds, so only do it every 10 minutes + // This can take up to 2 seconds, so only do it every 10 minutes. + // Initialize last_perfmon to 0 seconds, we don't skip the first call. static std::atomic<std::chrono::seconds> last_perfmon{std::chrono::seconds{0}}; auto last_time = last_perfmon.load(); auto current_time = GetTime<std::chrono::seconds>(); @@ -83,7 +84,7 @@ void RandAddSeedPerfmon(CSHA512& hasher) ret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, "Global", nullptr, nullptr, vData.data(), &nSize); if (ret != ERROR_MORE_DATA || vData.size() >= nMaxSize) break; - vData.resize(std::max((vData.size() * 3) / 2, nMaxSize)); // Grow size of buffer exponentially + vData.resize(std::min((vData.size() * 3) / 2, nMaxSize)); // Grow size of buffer exponentially } RegCloseKey(HKEY_PERFORMANCE_DATA); if (ret == ERROR_SUCCESS) { |