Squashed 'external/toxcore/c-toxcore/' changes from c9cdae001..9ed2fa80d
9ed2fa80d fix(toxav): remove extra copy of video frame on encode de30cf3ad docs: Add new file kinds, that should be useful to all clients. d5b5e879d fix(DHT): Correct node skipping logic timed out nodes. 30e71fe97 refactor: Generate event dispatch functions and add tox_events_dispatch. 8fdbb0b50 style: Format parameter lists in event handlers. d00dee12b refactor: Add warning logs when losing chat invites. b144e8db1 feat: Add a way to look up a file number by ID. 849281ea0 feat: Add a way to fetch groups by chat ID. a2c177396 refactor: Harden event system and improve type safety. 8f5caa656 refactor: Add MessagePack string support to bin_pack. 34e8d5ad5 chore: Add GitHub CodeQL workflow and local Docker runner. f7b068010 refactor: Add nullability annotations to event headers. 788abe651 refactor(toxav): Use system allocator for mutexes. 2e4b423eb refactor: Use specific typedefs for public API arrays. 2baf34775 docs(toxav): update idle iteration interval see 679444751876fa3882a717772918ebdc8f083354 2f87ac67b feat: Add Event Loop abstraction (Ev). f8dfc38d8 test: Fix data race in ToxScenario virtual_clock. 38313921e test(TCP): Add regression test for TCP priority queue integrity. f94a50d9a refactor(toxav): Replace mutable_mutex with dynamically allocated mutex. ad054511e refactor: Internalize DHT structs and add debug helpers. 8b467cc96 fix: Prevent potential integer overflow in group chat handshake. 4962bdbb8 test: Improve TCP simulation and add tests 5f0227093 refactor: Allow nullable data in group chat handlers. e97b18ea9 chore: Improve Windows Docker support. b14943bbd refactor: Move Logger out of Messenger into Tox. dd3136250 cleanup: Apply nullability qualifiers to C++ codebase. 1849f70fc refactor: Extract low-level networking code to net and os_network. 8fec75421 refactor: Delete tox_random, align on rng and os_random. a03ae8051 refactor: Delete tox_memory, align on mem and os_memory. 4c88fed2c refactor: Use `std::` prefixes more consistently in C++ code. 72452f2ae test: Add some more tests for onion and shared key cache. d5a51b09a cleanup: Use tox_attributes.h in tox_private.h and install it. b6f5b9fc5 test: Add some benchmarks for various high level things. 8a8d02785 test(support): Introduce threaded Tox runner and simulation barrier d68d1d095 perf(toxav): optimize audio and video intermediate buffers by keeping them around REVERT: c9cdae001 fix(toxav): remove extra copy of video frame on encode git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 9ed2fa80d582c714d6bdde6a7648220a92cddff8
This commit is contained in:
@@ -7,6 +7,8 @@
|
||||
#include <cstring>
|
||||
#include <vector>
|
||||
|
||||
#include "../../../toxcore/attributes.h"
|
||||
|
||||
namespace tox::test {
|
||||
|
||||
struct Fuzz_Data {
|
||||
@@ -14,12 +16,12 @@ struct Fuzz_Data {
|
||||
static constexpr std::size_t TRACE_TRAP = -1;
|
||||
|
||||
private:
|
||||
const uint8_t *data_;
|
||||
const uint8_t *base_;
|
||||
const uint8_t *_Nonnull data_;
|
||||
const uint8_t *_Nonnull base_;
|
||||
std::size_t size_;
|
||||
|
||||
public:
|
||||
Fuzz_Data(const uint8_t *input_data, std::size_t input_size)
|
||||
Fuzz_Data(const uint8_t *_Nonnull input_data, std::size_t input_size)
|
||||
: data_(input_data)
|
||||
, base_(input_data)
|
||||
, size_(input_size)
|
||||
@@ -30,7 +32,7 @@ public:
|
||||
Fuzz_Data(const Fuzz_Data &rhs) = delete;
|
||||
|
||||
struct Consumer {
|
||||
const char *func;
|
||||
const char *_Nonnull func;
|
||||
Fuzz_Data &fd;
|
||||
|
||||
operator bool()
|
||||
@@ -51,14 +53,14 @@ public:
|
||||
{
|
||||
if (sizeof(T) > fd.size())
|
||||
return T{};
|
||||
const uint8_t *bytes = fd.consume(func, sizeof(T));
|
||||
const uint8_t *_Nonnull bytes = fd.consume(func, sizeof(T));
|
||||
T val;
|
||||
std::memcpy(&val, bytes, sizeof(T));
|
||||
return val;
|
||||
}
|
||||
};
|
||||
|
||||
Consumer consume1(const char *func) { return Consumer{func, *this}; }
|
||||
Consumer consume1(const char *_Nonnull func) { return Consumer{func, *this}; }
|
||||
|
||||
template <typename T>
|
||||
T consume_integral()
|
||||
@@ -81,7 +83,7 @@ public:
|
||||
{
|
||||
if (count == 0 || count > size_)
|
||||
return {};
|
||||
const uint8_t *start = consume("consume_bytes", count);
|
||||
const uint8_t *_Nullable start = consume("consume_bytes", count);
|
||||
if (!start)
|
||||
return {};
|
||||
return std::vector<uint8_t>(start, start + count);
|
||||
@@ -92,20 +94,20 @@ public:
|
||||
if (empty())
|
||||
return {};
|
||||
std::size_t count = size();
|
||||
const uint8_t *start = consume("consume_remaining_bytes", count);
|
||||
const uint8_t *_Nonnull start = consume("consume_remaining_bytes", count);
|
||||
return std::vector<uint8_t>(start, start + count);
|
||||
}
|
||||
|
||||
std::size_t size() const { return size_; }
|
||||
std::size_t pos() const { return data_ - base_; }
|
||||
const uint8_t *data() const { return data_; }
|
||||
const uint8_t *_Nonnull data() const { return data_; }
|
||||
bool empty() const { return size_ == 0; }
|
||||
|
||||
const uint8_t *consume(const char *func, std::size_t count)
|
||||
const uint8_t *_Nullable consume(const char *_Nonnull func, std::size_t count)
|
||||
{
|
||||
if (count > size_)
|
||||
return nullptr;
|
||||
const uint8_t *val = data_;
|
||||
const uint8_t *_Nonnull val = data_;
|
||||
if (FUZZ_DEBUG) {
|
||||
if (count == 1) {
|
||||
std::printf("consume@%zu(%s): %d (0x%02x)\n", pos(), func, val[0], val[0]);
|
||||
@@ -170,7 +172,7 @@ struct Fuzz_Target_Selector<> {
|
||||
};
|
||||
|
||||
template <Fuzz_Target... Args>
|
||||
void fuzz_select_target(const uint8_t *data, std::size_t size)
|
||||
void fuzz_select_target(const uint8_t *_Nonnull data, std::size_t size)
|
||||
{
|
||||
Fuzz_Data input{data, size};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user