StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Fixed possible bugs in tox_array.

Browse Source
This commit is contained in:
irungentoo 2013-08-30 08:52:53 -04:00
parent 8f0bef5f20
commit ba5bd35a12
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
toxcore/misc_tools.h
View File

@ -135,7 +135,12 @@ static inline void tox_array_delete(tox_array *arr)
static inline uint8_t tox_array_push_ptr(tox_array *arr, uint8_t *item)
{
arr->data = realloc(arr->data, arr->elem_size * (arr->len + 1));
uint8_t *temp = realloc(arr->data, arr->elem_size * (arr->len + 1));
if (temp == NULL)
return 0;
arr->data = temp;
if (item != NULL)
memcpy(arr->data + arr->elem_size * arr->len, item, arr->elem_size);
@ -152,10 +157,25 @@ static inline uint8_t tox_array_push_ptr(tox_array *arr, uint8_t *item)
static inline void tox_array_pop(tox_array *arr, uint32_t num)
{
if (num == 0)
num = 1;
return;
if (num > arr->len)
return;
if (arr->len == num) {
free(arr->data);
arr->data = NULL;
arr->len = 0;
return;
}
uint8_t *temp = realloc(arr->data, arr->elem_size * (arr->len - num));
if (temp == NULL)
return;
arr->len -= num;
arr->data = realloc(arr->data, arr->elem_size * arr->len);
arr->data = temp;
}
/* TODO: return ptr and do not take type */