Skip to content

Commit 5174b53

Browse files
author
MarcoFalke
committed
Merge #20289: fuzz: Check for addrv1 compatibility before using addrv1 serializer/deserializer on CService
c2cf8a1 fuzz: Check for addrv1 compatibility before using addrv1 serializer on CService (practicalswift) Pull request description: Check for addrv1 compatibility before using addrv1 serializer/deserializer on `CService`: Before this patch: ``` $ src/test/fuzz/service_deserialize service_deserialize: test/fuzz/deserialize.cpp:85: void (anonymous namespace)::AssertEqualAfterSerializeDeserialize(const T &, const int) [T = CService]: Assertion `Deserialize<T>(Serialize(obj, version)) == obj' failed. ``` After this patch: ``` $ src/test/fuzz/service_deserialize … ``` Related change: #20247 ACKs for top commit: MarcoFalke: review ACK c2cf8a1 Tree-SHA512: dba6ddc60e8ef621011d844281461f1741de08c4af1a2b7156c810af44306cef7ec582de5974752db02ca085cfd23da0296d70b694e59ee262589d829fa0626e
2 parents 8387f83 + c2cf8a1 commit 5174b53

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/test/fuzz/deserialize.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,10 @@ void test_one_input(const std::vector<uint8_t>& buffer)
191191
#elif SERVICE_DESERIALIZE
192192
CService s;
193193
DeserializeFromFuzzingInput(buffer, s);
194-
AssertEqualAfterSerializeDeserialize(s);
194+
if (s.IsAddrV1Compatible()) {
195+
AssertEqualAfterSerializeDeserialize(s);
196+
}
197+
AssertEqualAfterSerializeDeserialize(s, INIT_PROTO_VERSION | ADDRV2_FORMAT);
195198
#elif MESSAGEHEADER_DESERIALIZE
196199
CMessageHeader mh;
197200
DeserializeFromFuzzingInput(buffer, mh);

0 commit comments

Comments
 (0)