Skip to content

Commit

Permalink
refactor: Use tox memory for group moderation/pack allocations.
Browse files Browse the repository at this point in the history
  • Loading branch information
@iphydf
iphydf committed Jan 4, 2025
1 parent 7f26d52 commit fc08bd5
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 42 deletions.
52 changes: 26 additions & 26 deletions toxcore/group_moderation.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <assert.h>

#include <stdlib.h>

#include <string.h>
#include <time.h>

Expand Down Expand Up @@ -51,7 +51,7 @@ int mod_list_unpack(Moderation *moderation, const uint8_t *data, uint16_t length
return 0;
}

uint8_t **tmp_list = (uint8_t **)calloc(num_mods, sizeof(uint8_t *));
uint8_t **tmp_list = (uint8_t **)mem_valloc(moderation->mem, num_mods, sizeof(uint8_t *));

if (tmp_list == nullptr) {
return -1;
Expand All @@ -60,7 +60,7 @@ int mod_list_unpack(Moderation *moderation, const uint8_t *data, uint16_t length
uint16_t unpacked_len = 0;

for (uint16_t i = 0; i < num_mods; ++i) {
uint8_t *entry = (uint8_t *)malloc(MOD_LIST_ENTRY_SIZE);
uint8_t *entry = (uint8_t *)mem_balloc(moderation->mem, MOD_LIST_ENTRY_SIZE);

if (entry == nullptr) {
free_uint8_t_pointer_array(moderation->mem, tmp_list, i);
Expand Down Expand Up @@ -102,7 +102,7 @@ bool mod_list_make_hash(const Moderation *moderation, uint8_t *hash)

assert(data_buf_size > 0);

uint8_t *data = (uint8_t *)malloc(data_buf_size);
uint8_t *data = (uint8_t *)mem_balloc(moderation->mem, data_buf_size);

if (data == nullptr) {
return false;
Expand All @@ -112,7 +112,7 @@ bool mod_list_make_hash(const Moderation *moderation, uint8_t *hash)

mod_list_get_data_hash(hash, data, data_buf_size);

free(data);
mem_delete(moderation->mem, data);

return true;
}
Expand Down Expand Up @@ -166,10 +166,10 @@ bool mod_list_remove_index(Moderation *moderation, uint16_t index)
MOD_LIST_ENTRY_SIZE);
}

free(moderation->mod_list[moderation->num_mods]);
mem_delete(moderation->mem, moderation->mod_list[moderation->num_mods]);
moderation->mod_list[moderation->num_mods] = nullptr;

uint8_t **tmp_list = (uint8_t **)realloc(moderation->mod_list, moderation->num_mods * sizeof(uint8_t *));
uint8_t **tmp_list = (uint8_t **)mem_vrealloc(moderation->mem, moderation->mod_list, moderation->num_mods, sizeof(uint8_t *));

if (tmp_list == nullptr) {
return false;
Expand Down Expand Up @@ -203,15 +203,15 @@ bool mod_list_add_entry(Moderation *moderation, const uint8_t *mod_data)
return false;
}

uint8_t **tmp_list = (uint8_t **)realloc(moderation->mod_list, (moderation->num_mods + 1) * sizeof(uint8_t *));
uint8_t **tmp_list = (uint8_t **)mem_vrealloc(moderation->mem, moderation->mod_list, moderation->num_mods + 1, sizeof(uint8_t *));

if (tmp_list == nullptr) {
return false;
}

moderation->mod_list = tmp_list;

uint8_t *entry = (uint8_t *)malloc(MOD_LIST_ENTRY_SIZE);
uint8_t *entry = (uint8_t *)mem_balloc(moderation->mem, MOD_LIST_ENTRY_SIZE);

if (entry == nullptr) {
return false;
Expand Down Expand Up @@ -405,8 +405,8 @@ int sanctions_list_unpack(Mod_Sanction *sanctions, Mod_Sanction_Creds *creds, ui
*
* Return true on success.
*/
non_null(4) nullable(1)
static bool sanctions_list_make_hash(const Mod_Sanction *sanctions, uint32_t new_version, uint16_t num_sanctions,
non_null(1, 5) nullable(2)
static bool sanctions_list_make_hash(const Memory *mem, const Mod_Sanction *sanctions, uint32_t new_version, uint16_t num_sanctions,
uint8_t *hash)
{
if (num_sanctions == 0 || sanctions == nullptr) {
Expand All @@ -422,7 +422,7 @@ static bool sanctions_list_make_hash(const Mod_Sanction *sanctions, uint32_t new
return false;
}

uint8_t *data = (uint8_t *)malloc(data_buf_size);
uint8_t *data = (uint8_t *)mem_balloc(mem, data_buf_size);

if (data == nullptr) {
return false;
Expand All @@ -435,7 +435,7 @@ static bool sanctions_list_make_hash(const Mod_Sanction *sanctions, uint32_t new
memcpy(&data[sig_data_size], &new_version, sizeof(uint32_t));
crypto_sha256(hash, data, data_buf_size);

free(data);
mem_delete(mem, data);

return true;
}
Expand Down Expand Up @@ -492,7 +492,7 @@ bool sanctions_list_make_creds(Moderation *moderation)

uint8_t hash[MOD_SANCTION_HASH_SIZE];

if (!sanctions_list_make_hash(moderation->sanctions, moderation->sanctions_creds.version,
if (!sanctions_list_make_hash(moderation->mem, moderation->sanctions, moderation->sanctions_creds.version,
moderation->num_sanctions, hash)) {
moderation->sanctions_creds = old_creds;
return false;
Expand Down Expand Up @@ -533,7 +533,7 @@ static bool sanctions_creds_validate(const Moderation *moderation, const Mod_San

uint8_t hash[MOD_SANCTION_HASH_SIZE];

if (!sanctions_list_make_hash(sanctions, creds->version, num_sanctions, hash)) {
if (!sanctions_list_make_hash(moderation->mem, sanctions, creds->version, num_sanctions, hash)) {
return false;
}

Expand Down Expand Up @@ -612,9 +612,9 @@ static bool sanctions_apply_new(Moderation *moderation, Mod_Sanction *new_sancti
* memory returned by this function.
*/
non_null()
static Mod_Sanction *sanctions_list_copy(const Mod_Sanction *sanctions, uint16_t num_sanctions)
static Mod_Sanction *sanctions_list_copy(const Memory *mem, const Mod_Sanction *sanctions, uint16_t num_sanctions)
{
Mod_Sanction *copy = (Mod_Sanction *)calloc(num_sanctions, sizeof(Mod_Sanction));
Mod_Sanction *copy = (Mod_Sanction *)mem_valloc(mem, num_sanctions, sizeof(Mod_Sanction));

if (copy == nullptr) {
return nullptr;
Expand Down Expand Up @@ -655,7 +655,7 @@ static bool sanctions_list_remove_index(Moderation *moderation, uint16_t index,
}

/* Operate on a copy of the list in case something goes wrong. */
Mod_Sanction *sanctions_copy = sanctions_list_copy(moderation->sanctions, moderation->num_sanctions);
Mod_Sanction *sanctions_copy = sanctions_list_copy(moderation->mem, moderation->sanctions, moderation->num_sanctions);

if (sanctions_copy == nullptr) {
return false;
Expand All @@ -665,15 +665,15 @@ static bool sanctions_list_remove_index(Moderation *moderation, uint16_t index,
sanctions_copy[index] = sanctions_copy[new_num];
}

Mod_Sanction *new_list = (Mod_Sanction *)realloc(sanctions_copy, new_num * sizeof(Mod_Sanction));
Mod_Sanction *new_list = (Mod_Sanction *)mem_vrealloc(moderation->mem, sanctions_copy, new_num, sizeof(Mod_Sanction));

if (new_list == nullptr) {
free(sanctions_copy);
mem_delete(moderation->mem, sanctions_copy);
return false;
}

if (!sanctions_apply_new(moderation, new_list, creds, new_num)) {
free(new_list);
mem_delete(moderation->mem, new_list);
return false;
}

Expand Down Expand Up @@ -753,25 +753,25 @@ bool sanctions_list_add_entry(Moderation *moderation, const Mod_Sanction *sancti
Mod_Sanction *sanctions_copy = nullptr;

if (moderation->num_sanctions > 0) {
sanctions_copy = sanctions_list_copy(moderation->sanctions, moderation->num_sanctions);
sanctions_copy = sanctions_list_copy(moderation->mem, moderation->sanctions, moderation->num_sanctions);

if (sanctions_copy == nullptr) {
return false;
}
}

const uint16_t index = moderation->num_sanctions;
Mod_Sanction *new_list = (Mod_Sanction *)realloc(sanctions_copy, (index + 1) * sizeof(Mod_Sanction));
Mod_Sanction *new_list = (Mod_Sanction *)mem_vrealloc(moderation->mem, sanctions_copy, index + 1, sizeof(Mod_Sanction));

if (new_list == nullptr) {
free(sanctions_copy);
mem_delete(moderation->mem, sanctions_copy);
return false;
}

new_list[index] = *sanction;

if (!sanctions_apply_new(moderation, new_list, creds, index + 1)) {
free(new_list);
mem_delete(moderation->mem, new_list);
return false;
}

Expand Down Expand Up @@ -864,7 +864,7 @@ uint16_t sanctions_list_replace_sig(Moderation *moderation, const uint8_t *publi

void sanctions_list_cleanup(Moderation *moderation)
{
free(moderation->sanctions);
mem_delete(moderation->mem, moderation->sanctions);

moderation->sanctions = nullptr;
moderation->num_sanctions = 0;
Expand Down
2 changes: 0 additions & 2 deletions toxcore/group_onion_announce.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <assert.h>
#include <string.h>

#include "DHT.h"
#include "attributes.h"
#include "ccompat.h"
#include "crypto_core.h"
Expand All @@ -18,7 +17,6 @@
#include "mono_time.h"
#include "network.h"
#include "onion_announce.h"
#include "timed_auth.h"

static_assert(GCA_ANNOUNCE_MAX_SIZE <= ONION_MAX_EXTRA_DATA_SIZE,
"GC_Announce does not fit into the onion packet extra data");
Expand Down
28 changes: 14 additions & 14 deletions toxcore/group_pack.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "group_pack.h"

#include <stdint.h>
#include <stdlib.h>
#include <string.h>

#include "DHT.h"
Expand All @@ -23,7 +22,7 @@
#include "group_common.h"
#include "group_moderation.h"
#include "logger.h"
#include "network.h"
#include "mem.h"
#include "util.h"

bool group_privacy_state_from_int(uint8_t value, Group_Privacy_State *out_enum)
Expand Down Expand Up @@ -180,7 +179,7 @@ static bool load_unpack_mod_list(GC_Chat *chat, Bin_Unpack *bu)
chat->moderation.num_mods = MOD_MAX_NUM_MODERATORS;
}

uint8_t *packed_mod_list = (uint8_t *)malloc(chat->moderation.num_mods * MOD_LIST_ENTRY_SIZE);
uint8_t *packed_mod_list = (uint8_t *)mem_balloc(chat->mem, chat->moderation.num_mods * MOD_LIST_ENTRY_SIZE);

if (packed_mod_list == nullptr) {
LOGGER_ERROR(chat->log, "Failed to allocate memory for packed mod list");
Expand All @@ -191,17 +190,17 @@ static bool load_unpack_mod_list(GC_Chat *chat, Bin_Unpack *bu)

if (!bin_unpack_bin_fixed(bu, packed_mod_list, packed_size)) {
LOGGER_ERROR(chat->log, "Failed to unpack mod list binary data");
free(packed_mod_list);
mem_delete(chat->mem, packed_mod_list);
return false;
}

if (mod_list_unpack(&chat->moderation, packed_mod_list, packed_size, chat->moderation.num_mods) == -1) {
LOGGER_ERROR(chat->log, "Failed to unpack mod list info");
free(packed_mod_list);
mem_delete(chat->mem, packed_mod_list);
return false;
}

free(packed_mod_list);
mem_delete(chat->mem, packed_mod_list);

return true;
}
Expand Down Expand Up @@ -299,7 +298,7 @@ static bool load_unpack_saved_peers(GC_Chat *chat, Bin_Unpack *bu)
return true;
}

uint8_t *saved_peers = (uint8_t *)malloc(saved_peers_size * GC_SAVED_PEER_SIZE);
uint8_t *saved_peers = (uint8_t *)mem_balloc(chat->mem, saved_peers_size * GC_SAVED_PEER_SIZE);

if (saved_peers == nullptr) {
LOGGER_ERROR(chat->log, "Failed to allocate memory for saved peer list");
Expand All @@ -308,15 +307,15 @@ static bool load_unpack_saved_peers(GC_Chat *chat, Bin_Unpack *bu)

if (!bin_unpack_bin_fixed(bu, saved_peers, saved_peers_size)) {
LOGGER_ERROR(chat->log, "Failed to unpack saved peers binary data");
free(saved_peers);
mem_delete(chat->mem, saved_peers);
return false;
}

if (unpack_gc_saved_peers(chat, saved_peers, saved_peers_size) == -1) {
LOGGER_ERROR(chat->log, "Failed to unpack saved peers"); // recoverable error
}

free(saved_peers);
mem_delete(chat->mem, saved_peers);

return true;
}
Expand Down Expand Up @@ -390,7 +389,7 @@ static void save_pack_mod_list(const GC_Chat *chat, Bin_Pack *bp)
return;
}

uint8_t *packed_mod_list = (uint8_t *)malloc(num_mods * MOD_LIST_ENTRY_SIZE);
uint8_t *packed_mod_list = (uint8_t *)mem_balloc(chat->mem, num_mods * MOD_LIST_ENTRY_SIZE);

// we can still recover without the mod list
if (packed_mod_list == nullptr) {
Expand All @@ -408,7 +407,7 @@ static void save_pack_mod_list(const GC_Chat *chat, Bin_Pack *bp)

bin_pack_bin(bp, packed_mod_list, packed_size); // 2

free(packed_mod_list);
mem_delete(chat->mem, packed_mod_list);
}

non_null()
Expand Down Expand Up @@ -445,7 +444,8 @@ static void save_pack_saved_peers(const GC_Chat *chat, Bin_Pack *bp)
{
bin_pack_array(bp, 2);

uint8_t *saved_peers = (uint8_t *)malloc(GC_MAX_SAVED_PEERS * GC_SAVED_PEER_SIZE);
// uint8_t *saved_peers = (uint8_t *)malloc(GC_MAX_SAVED_PEERS * GC_SAVED_PEER_SIZE);
uint8_t *saved_peers = (uint8_t *)mem_balloc(chat->mem, GC_MAX_SAVED_PEERS * GC_SAVED_PEER_SIZE);

// we can still recover without the saved peers list
if (saved_peers == nullptr) {
Expand All @@ -466,13 +466,13 @@ static void save_pack_saved_peers(const GC_Chat *chat, Bin_Pack *bp)

if (packed_size == 0) {
bin_pack_nil(bp); // 2
free(saved_peers);
mem_delete(chat->mem, saved_peers);
return;
}

bin_pack_bin(bp, saved_peers, packed_size); // 2

free(saved_peers);
mem_delete(chat->mem, saved_peers);
}

void gc_save_pack_group(const GC_Chat *chat, Bin_Pack *bp)
Expand Down

0 comments on commit fc08bd5

Please sign in to comment.