Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: group av memory leak #1926

Merged
merged 1 commit into from
Jan 23, 2022
Merged

fix: group av memory leak #1926

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions toxav/groupav.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ typedef struct Group_JitterBuffer {
uint64_t last_queued_time;
} Group_JitterBuffer;

static void free_audio_packet(Group_Audio_Packet *pk)
{
if (pk == nullptr) {
return;
}

free(pk->data);
free(pk);
}

static Group_JitterBuffer *create_queue(unsigned int capacity)
{
unsigned int size = 1;
Expand Down Expand Up @@ -58,11 +68,9 @@ static Group_JitterBuffer *create_queue(unsigned int capacity)
static void clear_queue(Group_JitterBuffer *q)
{
while (q->bottom != q->top) {
if (q->queue[q->bottom % q->size]) {
free(q->queue[q->bottom % q->size]);
q->queue[q->bottom % q->size] = nullptr;
}

const size_t idx = q->bottom % q->size;
free_audio_packet(q->queue[idx]);
q->queue[idx] = nullptr;
++q->bottom;
}
}
Expand Down Expand Up @@ -279,16 +287,6 @@ static void group_av_groupchat_delete(void *object, uint32_t groupnumber)
}
}

static void free_audio_packet(Group_Audio_Packet *pk)
{
if (pk == nullptr) {
return;
}

free(pk->data);
free(pk);
}

static int decode_audio_packet(Group_AV *group_av, Group_Peer_AV *peer_av, uint32_t groupnumber,
uint32_t friendgroupnumber)
{
Expand Down