highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-25 05:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle negative timeout for waitTipChanged()

Browse Source
This commit is contained in:
Sjors Provoost
2025-02-19 15:54:35 +01:00
parent c20a5ce106
commit f9cf8bd0ab
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/interfaces/mining.h
View File

@@ -93,7 +93,8 @@ public:
* *
* @param[in] current_tip block hash of the current chain tip. Function waits * @param[in] current_tip block hash of the current chain tip. Function waits
* for the chain tip to differ from this. * for the chain tip to differ from this.
* @param[in] timeout how long to wait for a new tip * @param[in] timeout how long to wait for a new tip (default is forever)
*
* @returns Hash and height of the current chain tip after this call. * @returns Hash and height of the current chain tip after this call.
*/ */
virtual BlockRef waitTipChanged(uint256 current_tip, MillisecondsDouble timeout = MillisecondsDouble::max()) = 0; virtual BlockRef waitTipChanged(uint256 current_tip, MillisecondsDouble timeout = MillisecondsDouble::max()) = 0;

2
src/node/interfaces.cpp
View File

@@ -1072,6 +1072,8 @@ public:
BlockRef waitTipChanged(uint256 current_tip, MillisecondsDouble timeout) override BlockRef waitTipChanged(uint256 current_tip, MillisecondsDouble timeout) override
{ {
Assume(timeout >= 0ms); // No internal callers should use a negative timeout
if (timeout < 0ms) timeout = 0ms;
if (timeout > std::chrono::years{100}) timeout = std::chrono::years{100}; // Upper bound to avoid UB in std::chrono if (timeout > std::chrono::years{100}) timeout = std::chrono::years{100}; // Upper bound to avoid UB in std::chrono
{ {
WAIT_LOCK(notifications().m_tip_block_mutex, lock); WAIT_LOCK(notifications().m_tip_block_mutex, lock);