phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 23:09:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fuzz: Avoid extraneous copy of input data, using Span<>

Browse source
This commit is contained in:
MarcoFalke 2021-01-02 19:29:36 +01:00
parent ea96e17e1f
commit faf7d7418c
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/test/fuzz/deserialize.cpp
View file

@ -30,8 +30,6 @@
#include <stdint.h> #include <stdint.h>
#include <unistd.h> #include <unistd.h>
#include <vector>
#include <test/fuzz/fuzz.h> #include <test/fuzz/fuzz.h>
void initialize_deserialize() void initialize_deserialize()
@ -71,7 +69,7 @@ T Deserialize(CDataStream ds)
} }
template <typename T> template <typename T>
void DeserializeFromFuzzingInput(const std::vector<uint8_t>& buffer, T& obj, const Optional<int> protocol_version = nullopt) void DeserializeFromFuzzingInput(FuzzBufferType buffer, T& obj, const Optional<int> protocol_version = nullopt)
{ {
CDataStream ds(buffer, SER_NETWORK, INIT_PROTO_VERSION); CDataStream ds(buffer, SER_NETWORK, INIT_PROTO_VERSION);
if (protocol_version) { if (protocol_version) {

3
src/test/fuzz/fuzz.cpp
View file

@ -59,8 +59,7 @@ static bool read_stdin(std::vector<uint8_t>& data)
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
{ {
static const auto& test_one_input = *Assert(g_test_one_input); static const auto& test_one_input = *Assert(g_test_one_input);
const std::vector<uint8_t> input(data, data + size); test_one_input({data, size});
test_one_input(input);
return 0; return 0;
} }

11
src/test/fuzz/fuzz.h
View file

@ -5,12 +5,15 @@
#ifndef BITCOIN_TEST_FUZZ_FUZZ_H #ifndef BITCOIN_TEST_FUZZ_FUZZ_H
#define BITCOIN_TEST_FUZZ_FUZZ_H #define BITCOIN_TEST_FUZZ_FUZZ_H
#include <span.h>
#include <cstdint> #include <cstdint>
#include <functional> #include <functional>
#include <string_view> #include <string_view>
#include <vector>
using TypeTestOneInput = std::function<void(const std::vector<uint8_t>&)>; using FuzzBufferType = Span<const uint8_t>;
using TypeTestOneInput = std::function<void(FuzzBufferType)>;
using TypeInitialize = std::function<void()>; using TypeInitialize = std::function<void()>;
void FuzzFrameworkRegisterTarget(std::string_view name, TypeTestOneInput target, TypeInitialize init); void FuzzFrameworkRegisterTarget(std::string_view name, TypeTestOneInput target, TypeInitialize init);
@ -21,13 +24,13 @@ inline void FuzzFrameworkEmptyFun() {}
FUZZ_TARGET_INIT(name, FuzzFrameworkEmptyFun) FUZZ_TARGET_INIT(name, FuzzFrameworkEmptyFun)
#define FUZZ_TARGET_INIT(name, init_fun) \ #define FUZZ_TARGET_INIT(name, init_fun) \
void name##_fuzz_target(const std::vector<uint8_t>&); \ void name##_fuzz_target(FuzzBufferType); \
struct name##_Before_Main { \ struct name##_Before_Main { \
name##_Before_Main() \ name##_Before_Main() \
{ \ { \
FuzzFrameworkRegisterTarget(#name, name##_fuzz_target, init_fun); \ FuzzFrameworkRegisterTarget(#name, name##_fuzz_target, init_fun); \
} \ } \
} const static g_##name##_before_main; \ } const static g_##name##_before_main; \
void name##_fuzz_target(const std::vector<uint8_t>& buffer) void name##_fuzz_target(FuzzBufferType buffer)
#endif // BITCOIN_TEST_FUZZ_FUZZ_H #endif // BITCOIN_TEST_FUZZ_FUZZ_H

3
src/test/fuzz/process_message.cpp
View file

@ -30,7 +30,6 @@
#include <iostream> #include <iostream>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector>
namespace { namespace {
const TestingSetup* g_setup; const TestingSetup* g_setup;
@ -46,7 +45,7 @@ void initialize_process_message()
SyncWithValidationInterfaceQueue(); SyncWithValidationInterfaceQueue();
} }
void fuzz_target(const std::vector<uint8_t>& buffer, const std::string& LIMIT_TO_MESSAGE_TYPE) void fuzz_target(FuzzBufferType buffer, const std::string& LIMIT_TO_MESSAGE_TYPE)
{ {
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size()); FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());