From 510c6532bae9abc5beda1c126c945923a64680cb Mon Sep 17 00:00:00 2001 From: Ben Woosley Date: Thu, 4 Apr 2019 00:39:04 -0700 Subject: Extract ParseDescriptorRange So as to be consistently informative when the checks fail, and to protect against unintentional divergence among the checks. --- src/rpc/blockchain.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/rpc/blockchain.cpp') diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index d35f458b2e..53f8dfebaa 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -2224,8 +2224,7 @@ UniValue scantxoutset(const JSONRPCRequest& request) desc_str = desc_uni.get_str(); UniValue range_uni = find_value(scanobject, "range"); if (!range_uni.isNull()) { - range = ParseRange(range_uni); - if (range.first < 0 || (range.second >> 31) != 0 || range.second >= range.first + 1000000) throw JSONRPCError(RPC_INVALID_PARAMETER, "range out of range"); + range = ParseDescriptorRange(range_uni); } } else { throw JSONRPCError(RPC_INVALID_PARAMETER, "Scan object needs to be either a string or an object"); -- cgit v1.2.3