forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 8f0d505f9a..6d634674a9
6d634674a9 cleanup: Remove old type-ordered event getters. d1d48d1dfc feat: add ngc events 994ffecc6b refactor: Make event dispatch ordered by receive time. 812f931d5f fix: Make sure there's enough space for CONSUME1 in fuzzers. 50f1b30fa9 test: Add fuzz tests to the coverage run. df76f5cf47 chore: Move from gcov to llvm source-based coverage. 072e3beb3f fix: issues with packet broadcast error reporting 6b6718e4d2 cleanup: Make group packet entry creation less error-prone 5b9c420ce1 refactor: packet broadcast functions now return errors af4cb31028 refactor: Use `operator==` for equality tests of `Node_format`. 9592d590cf refactor(test): Slightly nicer C++ interface to tox Random. c66e10fb7a refactor: Minor refactoring of get_close_nodes functions. ebc9643862 fix: don't pass garbage data buffer to packet send functions 32b68cffca cleanup: Some more test cleanups, removing overly smart code. 0426624dcb refactor: Assign malloc return to a local variable first. afc38f2458 test: Add more unit tests for `add_to_list`. 05ce5c1ab9 test: Add "infer" CI check to github, remove from circle. REVERT: 8f0d505f9a feat: add ngc events REVERT: 9b8216e70c refactor: Make event dispatch ordered by receive time. git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 6d634674a929edb0ab70689dcbcb195b3547be13
This commit is contained in:
@ -11,19 +11,21 @@ namespace {
|
||||
|
||||
void TestUnpackAnnouncesList(Fuzz_Data &input)
|
||||
{
|
||||
CONSUME1_OR_RETURN(const uint8_t max_count, input);
|
||||
std::vector<GC_Announce> announces(max_count);
|
||||
CONSUME1_OR_RETURN(const uint8_t, max_count, input);
|
||||
// Always allocate at least something to avoid passing nullptr to functions below.
|
||||
std::vector<GC_Announce> announces(max_count + 1);
|
||||
|
||||
// TODO(iphydf): How do we know the packed size?
|
||||
CONSUME1_OR_RETURN(const uint16_t packed_size, input);
|
||||
CONSUME1_OR_RETURN(const uint16_t, packed_size, input);
|
||||
|
||||
Logger *logger = logger_new();
|
||||
if (gca_unpack_announces_list(logger, input.data, input.size, announces.data(), max_count)
|
||||
!= -1) {
|
||||
std::vector<uint8_t> packed(packed_size);
|
||||
// Always allocate at least something to avoid passing nullptr to functions below.
|
||||
std::vector<uint8_t> packed(packed_size + 1);
|
||||
size_t processed;
|
||||
gca_pack_announces_list(
|
||||
logger, packed.data(), packed.size(), announces.data(), announces.size(), &processed);
|
||||
logger, packed.data(), packed_size, announces.data(), max_count, &processed);
|
||||
}
|
||||
logger_kill(logger);
|
||||
}
|
||||
@ -33,12 +35,13 @@ void TestUnpackPublicAnnounce(Fuzz_Data &input)
|
||||
GC_Public_Announce public_announce;
|
||||
|
||||
// TODO(iphydf): How do we know the packed size?
|
||||
CONSUME1_OR_RETURN(const uint16_t packed_size, input);
|
||||
CONSUME1_OR_RETURN(const uint16_t, packed_size, input);
|
||||
|
||||
Logger *logger = logger_new();
|
||||
if (gca_unpack_public_announce(logger, input.data, input.size, &public_announce) != -1) {
|
||||
std::vector<uint8_t> packed(packed_size);
|
||||
gca_pack_public_announce(logger, packed.data(), packed.size(), &public_announce);
|
||||
// Always allocate at least something to avoid passing nullptr to functions below.
|
||||
std::vector<uint8_t> packed(packed_size + 1);
|
||||
gca_pack_public_announce(logger, packed.data(), packed_size, &public_announce);
|
||||
}
|
||||
logger_kill(logger);
|
||||
}
|
||||
@ -58,11 +61,11 @@ void TestDoGca(Fuzz_Data &input)
|
||||
assert(gca != nullptr);
|
||||
|
||||
while (input.size > 0) {
|
||||
CONSUME1_OR_RETURN(const uint8_t choice, input);
|
||||
CONSUME1_OR_RETURN(const uint8_t, choice, input);
|
||||
switch (choice) {
|
||||
case 0: {
|
||||
// Add an announce.
|
||||
CONSUME1_OR_RETURN(const uint16_t length, input);
|
||||
CONSUME1_OR_RETURN(const uint16_t, length, input);
|
||||
CONSUME_OR_RETURN(const uint8_t *data, input, length);
|
||||
GC_Public_Announce public_announce;
|
||||
if (gca_unpack_public_announce(logger.get(), data, length, &public_announce) != -1) {
|
||||
@ -72,7 +75,7 @@ void TestDoGca(Fuzz_Data &input)
|
||||
}
|
||||
case 1: {
|
||||
// Advance the time by a number of tox_iteration_intervals.
|
||||
CONSUME1_OR_RETURN(const uint8_t iterations, input);
|
||||
CONSUME1_OR_RETURN(const uint8_t, iterations, input);
|
||||
clock += iterations * 20;
|
||||
// Do an iteration.
|
||||
do_gca(mono_time.get(), gca.get());
|
||||
@ -80,7 +83,7 @@ void TestDoGca(Fuzz_Data &input)
|
||||
}
|
||||
case 2: {
|
||||
// Get announces.
|
||||
CONSUME1_OR_RETURN(const uint8_t max_nodes, input);
|
||||
CONSUME1_OR_RETURN(const uint8_t, max_nodes, input);
|
||||
std::vector<GC_Announce> gc_announces(max_nodes);
|
||||
CONSUME_OR_RETURN(const uint8_t *chat_id, input, CHAT_ID_SIZE);
|
||||
CONSUME_OR_RETURN(const uint8_t *except_public_key, input, ENC_PUBLIC_KEY_SIZE);
|
||||
|
Reference in New Issue
Block a user