forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 1828c5356..c9cdae001
c9cdae001 fix(toxav): remove extra copy of video frame on encode 4f6d4546b test: Improve the fake network library. a2581e700 refactor(toxcore): generate `Friend_Request` and `Dht_Nodes_Response` 2aaa11770 refactor(toxcore): use Tox_Memory in generated events 5c367452b test(toxcore): fix incorrect mutex in tox_scenario_get_time 8f92e710f perf: Add a timed limit of number of cookie requests. 695b6417a test: Add some more simulated network support. 815ae9ce9 test(toxcore): fix thread-safety in scenario framework 6d85c754e test(toxcore): add unit tests for net_crypto 9c22e79cc test(support): add SimulatedEnvironment for deterministic testing f34fcb195 chore: Update windows Dockerfile to debian stable (trixie). ece0e8980 fix(group_moderation): allow validating unsorted sanction list signatures a4fa754d7 refactor: rename struct Packet to struct Net_Packet d6f330f85 cleanup: Fix some warnings from coverity. e206bffa2 fix(group_chats): fix sync packets reverting topics 0e4715598 test: Add new scenario testing framework. 668291f44 refactor(toxcore): decouple Network_Funcs from sockaddr via IP_Port fc4396cef fix: potential division by zero in toxav and unsafe hex parsing 8e8b352ab refactor: Add nullable annotations to struct members. 7740bb421 refactor: decouple net_crypto from DHT 1936d4296 test: add benchmark for toxav audio and video 46bfdc2df fix: correct printf format specifiers for unsigned integers REVERT: 1828c5356 fix(toxav): remove extra copy of video frame on encode git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: c9cdae001341e701fca980c9bb9febfeb95d2902
This commit is contained in:
@@ -5,11 +5,21 @@
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
|
||||
#include "../testing/fuzzing/fuzz_support.hh"
|
||||
#include "../testing/fuzzing/fuzz_tox.hh"
|
||||
#include "../testing/support/public/fuzz_data.hh"
|
||||
#include "../testing/support/public/fuzz_helpers.hh"
|
||||
#include "../testing/support/public/simulated_environment.hh"
|
||||
|
||||
namespace {
|
||||
|
||||
using tox::test::configure_fuzz_memory_source;
|
||||
using tox::test::Fuzz_Data;
|
||||
using tox::test::SimulatedEnvironment;
|
||||
|
||||
constexpr uint16_t SIZE_IP_PORT = SIZE_IP6 + sizeof(uint16_t);
|
||||
|
||||
template <typename T>
|
||||
using Ptr = std::unique_ptr<T, void (*)(T *)>;
|
||||
|
||||
std::optional<std::tuple<IP_Port, IP_Port, const uint8_t *, size_t>> prepare(Fuzz_Data &input)
|
||||
{
|
||||
CONSUME_OR_RETURN_VAL(const uint8_t *ipp_packed, input, SIZE_IP_PORT, std::nullopt);
|
||||
@@ -43,16 +53,18 @@ void TestSendForwardRequest(Fuzz_Data &input)
|
||||
}
|
||||
const auto [ipp, forwarder, data, data_size] = prep.value();
|
||||
|
||||
// rest of the fuzz data is input for malloc and network
|
||||
Fuzz_System sys(input);
|
||||
SimulatedEnvironment env;
|
||||
auto node = env.create_node(ipp.port);
|
||||
configure_fuzz_memory_source(env.fake_memory(), input);
|
||||
|
||||
const Ptr<Logger> logger(logger_new(sys.mem.get()), logger_kill);
|
||||
const Ptr<Logger> logger(logger_new(&node->c_memory), logger_kill);
|
||||
if (logger == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
const Ptr<Networking_Core> net(new_networking_ex(logger.get(), sys.mem.get(), sys.ns.get(),
|
||||
&ipp.ip, ipp.port, ipp.port + 100, nullptr),
|
||||
const Ptr<Networking_Core> net(
|
||||
new_networking_ex(logger.get(), &node->c_memory, &node->c_network, &ipp.ip, ipp.port,
|
||||
ipp.port + 100, nullptr),
|
||||
kill_networking);
|
||||
if (net == nullptr) {
|
||||
return;
|
||||
@@ -72,16 +84,18 @@ void TestForwardReply(Fuzz_Data &input)
|
||||
}
|
||||
const auto [ipp, forwarder, data, data_size] = prep.value();
|
||||
|
||||
// rest of the fuzz data is input for malloc and network
|
||||
Fuzz_System sys(input);
|
||||
SimulatedEnvironment env;
|
||||
auto node = env.create_node(ipp.port);
|
||||
configure_fuzz_memory_source(env.fake_memory(), input);
|
||||
|
||||
const Ptr<Logger> logger(logger_new(sys.mem.get()), logger_kill);
|
||||
const Ptr<Logger> logger(logger_new(&node->c_memory), logger_kill);
|
||||
if (logger == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
const Ptr<Networking_Core> net(new_networking_ex(logger.get(), sys.mem.get(), sys.ns.get(),
|
||||
&ipp.ip, ipp.port, ipp.port + 100, nullptr),
|
||||
const Ptr<Networking_Core> net(
|
||||
new_networking_ex(logger.get(), &node->c_memory, &node->c_network, &ipp.ip, ipp.port,
|
||||
ipp.port + 100, nullptr),
|
||||
kill_networking);
|
||||
if (net == nullptr) {
|
||||
return;
|
||||
@@ -95,6 +109,6 @@ void TestForwardReply(Fuzz_Data &input)
|
||||
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
|
||||
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
|
||||
{
|
||||
fuzz_select_target<TestSendForwardRequest, TestForwardReply>(data, size);
|
||||
tox::test::fuzz_select_target<TestSendForwardRequest, TestForwardReply>(data, size);
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user