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

fuzz: Rework addr fuzzing

Browse Source 
* Replace ConsumeDeserializationParams with V1, because V2 is
  unconditionally checked as well.
* Also fuzz CAddress::Format::Disk in the address_deserialize fuzz
  target.
This commit is contained in:
MarcoFalke
2023-09-13 16:14:40 +02:00
parent fa5b6d29ee
commit fad52baf1e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/fuzz/deserialize.cpp
View File

@ -252,7 +252,7 @@ FUZZ_TARGET(netaddr_deserialize, .init = initialize_deserialize)
if (!maybe_na) return; if (!maybe_na) return;
const CNetAddr& na{*maybe_na}; const CNetAddr& na{*maybe_na};
if (na.IsAddrV1Compatible()) { if (na.IsAddrV1Compatible()) {
AssertEqualAfterSerializeDeserialize(na, ConsumeDeserializationParams<CNetAddr::SerParams>(fdp)); AssertEqualAfterSerializeDeserialize(na, CNetAddr::V1);
} }
AssertEqualAfterSerializeDeserialize(na, CNetAddr::V2); AssertEqualAfterSerializeDeserialize(na, CNetAddr::V2);
} }
@ -264,7 +264,7 @@ FUZZ_TARGET(service_deserialize, .init = initialize_deserialize)
if (!maybe_s) return; if (!maybe_s) return;
const CService& s{*maybe_s}; const CService& s{*maybe_s};
if (s.IsAddrV1Compatible()) { if (s.IsAddrV1Compatible()) {
AssertEqualAfterSerializeDeserialize(s, ConsumeDeserializationParams<CNetAddr::SerParams>(fdp)); AssertEqualAfterSerializeDeserialize(s, CNetAddr::V1);
} }
AssertEqualAfterSerializeDeserialize(s, CNetAddr::V2); AssertEqualAfterSerializeDeserialize(s, CNetAddr::V2);
if (ser_params.enc == CNetAddr::Encoding::V1) { if (ser_params.enc == CNetAddr::Encoding::V1) {
@ -279,8 +279,8 @@ FUZZ_TARGET_DESERIALIZE(messageheader_deserialize, {
FUZZ_TARGET(address_deserialize, .init = initialize_deserialize) FUZZ_TARGET(address_deserialize, .init = initialize_deserialize)
{ {
FuzzedDataProvider fdp{buffer.data(), buffer.size()}; FuzzedDataProvider fdp{buffer.data(), buffer.size()};
const auto ser_enc{ConsumeDeserializationParams<CNetAddr::SerParams>(fdp)}; const auto ser_enc{ConsumeDeserializationParams<CAddress::SerParams>(fdp)};
const auto maybe_a{ConsumeDeserializable<CAddress>(fdp, CAddress::SerParams{{ser_enc}, CAddress::Format::Network})}; const auto maybe_a{ConsumeDeserializable<CAddress>(fdp, ser_enc)};
if (!maybe_a) return; if (!maybe_a) return;
const CAddress& a{*maybe_a}; const CAddress& a{*maybe_a};
// A CAddress in V1 mode will roundtrip // A CAddress in V1 mode will roundtrip