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

Merge #20247: fuzz: Check for addrv1 compatibility before using addrv1 serializer. Fuzz addrv2 serialization.

Browse Source 
903f3d0627 fuzz: Check for addrv1 compatibility before using addrv1 serializer (practicalswift)

Pull request description:

  Fuzz addrv2 address serialization.

  Check for addrv1 compatibility before using addrv1 serializer.

  Before this

  ```
  $ src/test/fuzz/netaddr_deserialize
  netaddr_deserialize: test/fuzz/deserialize.cpp:84: void
      (anonymous namespace)::AssertEqualAfterSerializeDeserialize(const T &) [T = CNetAddr]:
      Assertion `Deserialize<T>(Serialize(obj)) == obj' failed.
  ```

  After this patch:

  ```
  $ src/test/fuzz/netaddr_deserialize
  …
  ```

ACKs for top commit:
  MarcoFalke:
    review ACK 903f3d0627

Tree-SHA512: a9ddb71cc31c877fa3dd78dbc908d1e30b4790398fefe19e6541f1fca81e8560f7a11fa099ef3943b94401974c472e523484fdf66f1c23ff2e998558ba4b65de
This commit is contained in:
MarcoFalke
2020-10-27 08:07:19 +01:00
parent d67883d01e 903f3d0627
commit fa463f1163
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@
#include <key.h> #include <key.h>
#include <merkleblock.h> #include <merkleblock.h>
#include <net.h> #include <net.h>
#include <netbase.h>
#include <node/utxo_snapshot.h> #include <node/utxo_snapshot.h>
#include <primitives/block.h> #include <primitives/block.h>
#include <protocol.h> #include <protocol.h>
@@ -44,9 +45,9 @@ struct invalid_fuzzing_input_exception : public std::exception {
}; };
template <typename T> template <typename T>
CDataStream Serialize(const T& obj) CDataStream Serialize(const T& obj, const int version = INIT_PROTO_VERSION)
{ {
CDataStream ds(SER_NETWORK, INIT_PROTO_VERSION); CDataStream ds(SER_NETWORK, version);
ds << obj; ds << obj;
return ds; return ds;
} }
@@ -79,9 +80,9 @@ void DeserializeFromFuzzingInput(const std::vector<uint8_t>& buffer, T& obj)
} }
template <typename T> template <typename T>
void AssertEqualAfterSerializeDeserialize(const T& obj) void AssertEqualAfterSerializeDeserialize(const T& obj, const int version = INIT_PROTO_VERSION)
{ {
assert(Deserialize<T>(Serialize(obj)) == obj); assert(Deserialize<T>(Serialize(obj, version)) == obj);
} }
} // namespace } // namespace
@@ -183,7 +184,10 @@ void test_one_input(const std::vector<uint8_t>& buffer)
#elif NETADDR_DESERIALIZE #elif NETADDR_DESERIALIZE
CNetAddr na; CNetAddr na;
DeserializeFromFuzzingInput(buffer, na); DeserializeFromFuzzingInput(buffer, na);
AssertEqualAfterSerializeDeserialize(na); if (na.IsAddrV1Compatible()) {
AssertEqualAfterSerializeDeserialize(na);
}
AssertEqualAfterSerializeDeserialize(na, INIT_PROTO_VERSION | ADDRV2_FORMAT);
#elif SERVICE_DESERIALIZE #elif SERVICE_DESERIALIZE
CService s; CService s;
DeserializeFromFuzzingInput(buffer, s); DeserializeFromFuzzingInput(buffer, s);