diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-02-11 12:39:57 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-02-11 12:40:12 +0100 |
| commit | 685c16fcb2c718154bf3e6114e35fcac351503f2 (patch) | |
| tree | 5069ff35c1f45c56b9115957f05ebc2448c3ccd7 /src/util | |
| parent | e498aeffbec96201005b9689ac9074370f7166d5 (diff) | |
| parent | 3ddbf22ed179a2db733af4b521bec5d2b13ebf4b (diff) | |
| download | bitcoin-685c16fcb2c718154bf3e6114e35fcac351503f2.tar.xz | |
Merge #21043: net: Avoid UBSan warning in ProcessMessage(...)
3ddbf22ed179a2db733af4b521bec5d2b13ebf4b util: Disallow negative mocktime (MarcoFalke)
f5f2f9716885e7548809e77f46b493c896a019bf net: Avoid UBSan warning in ProcessMessage(...) (practicalswift)
Pull request description:
Avoid UBSan warning in `ProcessMessage(...)`.
Context: https://github.com/bitcoin/bitcoin/pull/20380#issuecomment-770427182 (thanks Crypt-iQ!)
ACKs for top commit:
MarcoFalke:
re-ACK 3ddbf22ed179a2db733af4b521bec5d2b13ebf4b only change is adding patch written by me
ajtowns:
ACK 3ddbf22ed179a2db733af4b521bec5d2b13ebf4b -- code review only
Tree-SHA512: e8d7af0457ca86872b75a4e406c0a93aafd841c2962e244e147e748cc7ca118c56be0fdafe53765f4b291410030b2c3cc8f76f733b37a955d34fc885ab6037b9
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/time.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/util/time.cpp b/src/util/time.cpp index e96972fe12..d130e4e4d4 100644 --- a/src/util/time.cpp +++ b/src/util/time.cpp @@ -9,6 +9,8 @@ #include <util/time.h> +#include <util/check.h> + #include <atomic> #include <boost/date_time/posix_time/posix_time.hpp> #include <ctime> @@ -18,7 +20,7 @@ void UninterruptibleSleep(const std::chrono::microseconds& n) { std::this_thread::sleep_for(n); } -static std::atomic<int64_t> nMockTime(0); //!< For unit testing +static std::atomic<int64_t> nMockTime(0); //!< For testing int64_t GetTime() { @@ -46,6 +48,7 @@ template std::chrono::microseconds GetTime(); void SetMockTime(int64_t nMockTimeIn) { + Assert(nMockTimeIn >= 0); nMockTime.store(nMockTimeIn, std::memory_order_relaxed); } |