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:
@ -49,14 +49,15 @@ Ping_Array *ping_array_new(const Memory *mem, uint32_t size, uint32_t timeout)
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
empty_array->mem = mem;
|
||||
empty_array->entries = (Ping_Array_Entry *)mem_valloc(mem, size, sizeof(Ping_Array_Entry));
|
||||
Ping_Array_Entry *entries = (Ping_Array_Entry *)mem_valloc(mem, size, sizeof(Ping_Array_Entry));
|
||||
|
||||
if (empty_array->entries == nullptr) {
|
||||
if (entries == nullptr) {
|
||||
mem_delete(mem, empty_array);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
empty_array->mem = mem;
|
||||
empty_array->entries = entries;
|
||||
empty_array->last_deleted = 0;
|
||||
empty_array->last_added = 0;
|
||||
empty_array->total_size = size;
|
||||
@ -115,13 +116,16 @@ uint64_t ping_array_add(Ping_Array *array, const Mono_Time *mono_time, const Ran
|
||||
clear_entry(array, index);
|
||||
}
|
||||
|
||||
array->entries[index].data = (uint8_t *)mem_balloc(array->mem, length);
|
||||
uint8_t *entry_data = (uint8_t *)mem_balloc(array->mem, length);
|
||||
|
||||
if (array->entries[index].data == nullptr) {
|
||||
if (entry_data == nullptr) {
|
||||
array->entries[index].data = nullptr;
|
||||
return 0;
|
||||
}
|
||||
|
||||
memcpy(array->entries[index].data, data, length);
|
||||
memcpy(entry_data, data, length);
|
||||
|
||||
array->entries[index].data = entry_data;
|
||||
array->entries[index].length = length;
|
||||
array->entries[index].ping_time = mono_time_get(mono_time);
|
||||
++array->last_added;
|
||||
|
Reference in New Issue
Block a user