mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-08 10:31:50 -05:00
addrman: Log too low compat value
Also remove uint8_t{} casts from values that are already of the same type.
This commit is contained in:
parent
ee8c997125
commit
fa097d074b
3 changed files with 18 additions and 2 deletions
|
@ -246,12 +246,18 @@ void AddrManImpl::Unserialize(Stream& s_)
|
||||||
|
|
||||||
uint8_t compat;
|
uint8_t compat;
|
||||||
s >> compat;
|
s >> compat;
|
||||||
|
if (compat < INCOMPATIBILITY_BASE) {
|
||||||
|
throw std::ios_base::failure(strprintf(
|
||||||
|
"Corrupted addrman database: The compat value (%u) "
|
||||||
|
"is lower than the expected minimum value %u.",
|
||||||
|
compat, INCOMPATIBILITY_BASE));
|
||||||
|
}
|
||||||
const uint8_t lowest_compatible = compat - INCOMPATIBILITY_BASE;
|
const uint8_t lowest_compatible = compat - INCOMPATIBILITY_BASE;
|
||||||
if (lowest_compatible > FILE_FORMAT) {
|
if (lowest_compatible > FILE_FORMAT) {
|
||||||
throw InvalidAddrManVersionError(strprintf(
|
throw InvalidAddrManVersionError(strprintf(
|
||||||
"Unsupported format of addrman database: %u. It is compatible with formats >=%u, "
|
"Unsupported format of addrman database: %u. It is compatible with formats >=%u, "
|
||||||
"but the maximum supported by this version of %s is %u.",
|
"but the maximum supported by this version of %s is %u.",
|
||||||
uint8_t{format}, uint8_t{lowest_compatible}, PACKAGE_NAME, uint8_t{FILE_FORMAT}));
|
uint8_t{format}, lowest_compatible, PACKAGE_NAME, uint8_t{FILE_FORMAT}));
|
||||||
}
|
}
|
||||||
|
|
||||||
s >> nKey;
|
s >> nKey;
|
||||||
|
|
|
@ -68,6 +68,17 @@ class AddrmanTest(BitcoinTestFramework):
|
||||||
self.start_node(0, extra_args=["-checkaddrman=1"])
|
self.start_node(0, extra_args=["-checkaddrman=1"])
|
||||||
assert_equal(self.nodes[0].getnodeaddresses(), [])
|
assert_equal(self.nodes[0].getnodeaddresses(), [])
|
||||||
|
|
||||||
|
self.log.info("Check that addrman with negative lowest_compatible cannot be read")
|
||||||
|
self.stop_node(0)
|
||||||
|
write_addrman(peers_dat, lowest_compatible=-32)
|
||||||
|
self.nodes[0].assert_start_raises_init_error(
|
||||||
|
expected_msg=init_error(
|
||||||
|
"Corrupted addrman database: The compat value \\(0\\) is lower "
|
||||||
|
"than the expected minimum value 32.: (.+)"
|
||||||
|
),
|
||||||
|
match=ErrorMatch.FULL_REGEX,
|
||||||
|
)
|
||||||
|
|
||||||
self.log.info("Check that addrman from future is overwritten with new addrman")
|
self.log.info("Check that addrman from future is overwritten with new addrman")
|
||||||
self.stop_node(0)
|
self.stop_node(0)
|
||||||
write_addrman(peers_dat, lowest_compatible=111)
|
write_addrman(peers_dat, lowest_compatible=111)
|
||||||
|
|
|
@ -62,7 +62,6 @@ implicit-integer-sign-change:script/bitcoinconsensus.cpp
|
||||||
implicit-integer-sign-change:script/interpreter.cpp
|
implicit-integer-sign-change:script/interpreter.cpp
|
||||||
implicit-integer-sign-change:serialize.h
|
implicit-integer-sign-change:serialize.h
|
||||||
implicit-integer-sign-change:txmempool.cpp
|
implicit-integer-sign-change:txmempool.cpp
|
||||||
implicit-signed-integer-truncation:addrman.cpp
|
|
||||||
implicit-signed-integer-truncation:crypto/
|
implicit-signed-integer-truncation:crypto/
|
||||||
implicit-unsigned-integer-truncation:crypto/
|
implicit-unsigned-integer-truncation:crypto/
|
||||||
shift-base:arith_uint256.cpp
|
shift-base:arith_uint256.cpp
|
||||||
|
|
Loading…
Add table
Reference in a new issue