Merge commit '8eb4892b4976e82e020d0e30dcf8f0705b76bb4e'

This commit is contained in:
2024-01-12 21:30:48 +01:00
126 changed files with 1556 additions and 2484 deletions

View File

@ -587,7 +587,7 @@ static MSICall *new_call(MSISession *session, uint32_t friend_number)
session->calls_tail = friend_number;
session->calls_head = friend_number;
} else if (session->calls_tail < friend_number) { /* Appending */
MSICall **tmp = (MSICall **)realloc(session->calls, sizeof(MSICall *) * (friend_number + 1));
MSICall **tmp = (MSICall **)realloc(session->calls, (friend_number + 1) * sizeof(MSICall *));
if (tmp == nullptr) {
free(rc);

View File

@ -106,8 +106,9 @@ uint16_t rb_size(const RingBuffer *b)
uint16_t rb_data(const RingBuffer *b, void **dest)
{
uint16_t i;
const uint16_t size = rb_size(b);
for (i = 0; i < rb_size(b); ++i) {
for (i = 0; i < size; ++i) {
dest[i] = b->data[(b->start + i) % b->size];
}

View File

@ -1284,7 +1284,7 @@ static ToxAVCall *call_new(ToxAV *av, uint32_t friend_number, Toxav_Err_Call *er
av->calls_tail = friend_number;
av->calls_head = friend_number;
} else if (av->calls_tail < friend_number) { /* Appending */
ToxAVCall **tmp = (ToxAVCall **)realloc(av->calls, sizeof(ToxAVCall *) * (friend_number + 1));
ToxAVCall **tmp = (ToxAVCall **)realloc(av->calls, (friend_number + 1) * sizeof(ToxAVCall *));
if (tmp == nullptr) {
pthread_mutex_destroy(call->toxav_call_mutex);