Skip to content

Commit c2e0489

Browse files
committed
[rpc, bugfix] Enforce maximum value for setmocktime
1 parent 0de63b8 commit c2e0489

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/rpc/node.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <univalue.h>
2727
#include <util/any.h>
2828
#include <util/check.h>
29+
#include <util/time.h>
2930

3031
#include <stdint.h>
3132
#ifdef HAVE_MALLOC_INFO
@@ -58,9 +59,11 @@ static RPCHelpMan setmocktime()
5859
LOCK(cs_main);
5960

6061
const int64_t time{request.params[0].getInt<int64_t>()};
61-
if (time < 0) {
62-
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Mocktime cannot be negative: %s.", time));
62+
constexpr int64_t max_time{Ticks<std::chrono::seconds>(std::chrono::nanoseconds::max())};
63+
if (time < 0 || time > max_time) {
64+
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Mocktime must be in the range [0, %s], not %s.", max_time, time));
6365
}
66+
6467
SetMockTime(time);
6568
const NodeContext& node_context{EnsureAnyNodeContext(request.context)};
6669
for (const auto& chain_client : node_context.chain_clients) {

test/functional/rpc_uptime.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def run_test(self):
2323
self._test_uptime()
2424

2525
def _test_negative_time(self):
26-
assert_raises_rpc_error(-8, "Mocktime cannot be negative: -1.", self.nodes[0].setmocktime, -1)
26+
assert_raises_rpc_error(-8, "Mocktime must be in the range [0, 9223372036], not -1.", self.nodes[0].setmocktime, -1)
2727

2828
def _test_uptime(self):
2929
wait_time = 10

0 commit comments

Comments
 (0)