Squashed 'external/toxcore/c-toxcore/' changes from 03e9fbf3703..55752a2e2ef
55752a2e2ef fix(toxav): pass video bit rate as kbit Previously we unintentionally made it Mbit. 7e573280a75 docs(toxav): fix docs of toxav.h - fix units to be more readable - use width before height consistently - video -> audio typo 5f88a084e8c fix: friend_connections leak on allocation failure clean up when it only contains connections in the NONE state 6d27a1ae178 fix: wrong comment for closelist ce4f29e8036 cleanup: Fix all `-Wsign-compare` warnings. 4d4251c397f chore: lower cirrus ci timeout drastically 40676284507 fix: events leak that can occur if allocation fails rare in practice, found by fuzzing 9610ac31c5f fix: Return an error instead of crashing on nullptr args in NGC. a57c2c8f956 refactor: Make ToxAV independent of toxcore internals. 5752fc29f86 refactor: Make tox-bootstrapd use bool instead of int df675786eb2 chore: Add release-drafter github action. 03fd7a69dcf chore: Use toktok's cmp instead of upstream. 350c0ba1205 cleanup: Sort apk/apt install commands in Dockerfiles. 8c1bda502cb chore(deps): bump golang.org/x/net ddb9d3210da chore: Upgrade to FreeBSD 14.1 in cirrus build. e9076f45bd3 chore(cmake): set options changes as cache and with force git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 55752a2e2ef894bfa6d7a2a21a0278e3f2bede7d
This commit is contained in:
@ -109,7 +109,10 @@ static Tox_Event_Conference_Connected *tox_events_add_conference_connected(Tox_E
|
||||
event.type = TOX_EVENT_CONFERENCE_CONNECTED;
|
||||
event.data.conference_connected = conference_connected;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_conference_connected_free(conference_connected, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return conference_connected;
|
||||
}
|
||||
|
||||
|
@ -177,7 +177,10 @@ static Tox_Event_Conference_Invite *tox_events_add_conference_invite(Tox_Events
|
||||
event.type = TOX_EVENT_CONFERENCE_INVITE;
|
||||
event.data.conference_invite = conference_invite;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_conference_invite_free(conference_invite, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return conference_invite;
|
||||
}
|
||||
|
||||
|
@ -193,7 +193,10 @@ static Tox_Event_Conference_Message *tox_events_add_conference_message(Tox_Event
|
||||
event.type = TOX_EVENT_CONFERENCE_MESSAGE;
|
||||
event.data.conference_message = conference_message;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_conference_message_free(conference_message, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return conference_message;
|
||||
}
|
||||
|
||||
|
@ -109,7 +109,10 @@ static Tox_Event_Conference_Peer_List_Changed *tox_events_add_conference_peer_li
|
||||
event.type = TOX_EVENT_CONFERENCE_PEER_LIST_CHANGED;
|
||||
event.data.conference_peer_list_changed = conference_peer_list_changed;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_conference_peer_list_changed_free(conference_peer_list_changed, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return conference_peer_list_changed;
|
||||
}
|
||||
|
||||
|
@ -175,7 +175,10 @@ static Tox_Event_Conference_Peer_Name *tox_events_add_conference_peer_name(Tox_E
|
||||
event.type = TOX_EVENT_CONFERENCE_PEER_NAME;
|
||||
event.data.conference_peer_name = conference_peer_name;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_conference_peer_name_free(conference_peer_name, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return conference_peer_name;
|
||||
}
|
||||
|
||||
|
@ -175,7 +175,10 @@ static Tox_Event_Conference_Title *tox_events_add_conference_title(Tox_Events *e
|
||||
event.type = TOX_EVENT_CONFERENCE_TITLE;
|
||||
event.data.conference_title = conference_title;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_conference_title_free(conference_title, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return conference_title;
|
||||
}
|
||||
|
||||
|
@ -162,7 +162,10 @@ static Tox_Event_File_Chunk_Request *tox_events_add_file_chunk_request(Tox_Event
|
||||
event.type = TOX_EVENT_FILE_CHUNK_REQUEST;
|
||||
event.data.file_chunk_request = file_chunk_request;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_file_chunk_request_free(file_chunk_request, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return file_chunk_request;
|
||||
}
|
||||
|
||||
|
@ -207,7 +207,10 @@ static Tox_Event_File_Recv *tox_events_add_file_recv(Tox_Events *events, const M
|
||||
event.type = TOX_EVENT_FILE_RECV;
|
||||
event.data.file_recv = file_recv;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_file_recv_free(file_recv, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return file_recv;
|
||||
}
|
||||
|
||||
|
@ -191,7 +191,10 @@ static Tox_Event_File_Recv_Chunk *tox_events_add_file_recv_chunk(Tox_Events *eve
|
||||
event.type = TOX_EVENT_FILE_RECV_CHUNK;
|
||||
event.data.file_recv_chunk = file_recv_chunk;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_file_recv_chunk_free(file_recv_chunk, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return file_recv_chunk;
|
||||
}
|
||||
|
||||
|
@ -148,7 +148,10 @@ static Tox_Event_File_Recv_Control *tox_events_add_file_recv_control(Tox_Events
|
||||
event.type = TOX_EVENT_FILE_RECV_CONTROL;
|
||||
event.data.file_recv_control = file_recv_control;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_file_recv_control_free(file_recv_control, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return file_recv_control;
|
||||
}
|
||||
|
||||
|
@ -132,7 +132,10 @@ static Tox_Event_Friend_Connection_Status *tox_events_add_friend_connection_stat
|
||||
event.type = TOX_EVENT_FRIEND_CONNECTION_STATUS;
|
||||
event.data.friend_connection_status = friend_connection_status;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_friend_connection_status_free(friend_connection_status, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return friend_connection_status;
|
||||
}
|
||||
|
||||
|
@ -159,7 +159,10 @@ static Tox_Event_Friend_Lossless_Packet *tox_events_add_friend_lossless_packet(T
|
||||
event.type = TOX_EVENT_FRIEND_LOSSLESS_PACKET;
|
||||
event.data.friend_lossless_packet = friend_lossless_packet;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_friend_lossless_packet_free(friend_lossless_packet, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return friend_lossless_packet;
|
||||
}
|
||||
|
||||
|
@ -159,7 +159,10 @@ static Tox_Event_Friend_Lossy_Packet *tox_events_add_friend_lossy_packet(Tox_Eve
|
||||
event.type = TOX_EVENT_FRIEND_LOSSY_PACKET;
|
||||
event.data.friend_lossy_packet = friend_lossy_packet;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_friend_lossy_packet_free(friend_lossy_packet, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return friend_lossy_packet;
|
||||
}
|
||||
|
||||
|
@ -177,7 +177,10 @@ static Tox_Event_Friend_Message *tox_events_add_friend_message(Tox_Events *event
|
||||
event.type = TOX_EVENT_FRIEND_MESSAGE;
|
||||
event.data.friend_message = friend_message;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_friend_message_free(friend_message, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return friend_message;
|
||||
}
|
||||
|
||||
|
@ -159,7 +159,10 @@ static Tox_Event_Friend_Name *tox_events_add_friend_name(Tox_Events *events, con
|
||||
event.type = TOX_EVENT_FRIEND_NAME;
|
||||
event.data.friend_name = friend_name;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_friend_name_free(friend_name, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return friend_name;
|
||||
}
|
||||
|
||||
|
@ -130,7 +130,10 @@ static Tox_Event_Friend_Read_Receipt *tox_events_add_friend_read_receipt(Tox_Eve
|
||||
event.type = TOX_EVENT_FRIEND_READ_RECEIPT;
|
||||
event.data.friend_read_receipt = friend_read_receipt;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_friend_read_receipt_free(friend_read_receipt, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return friend_read_receipt;
|
||||
}
|
||||
|
||||
|
@ -152,7 +152,10 @@ static Tox_Event_Friend_Request *tox_events_add_friend_request(Tox_Events *event
|
||||
event.type = TOX_EVENT_FRIEND_REQUEST;
|
||||
event.data.friend_request = friend_request;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_friend_request_free(friend_request, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return friend_request;
|
||||
}
|
||||
|
||||
|
@ -132,7 +132,10 @@ static Tox_Event_Friend_Status *tox_events_add_friend_status(Tox_Events *events,
|
||||
event.type = TOX_EVENT_FRIEND_STATUS;
|
||||
event.data.friend_status = friend_status;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_friend_status_free(friend_status, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return friend_status;
|
||||
}
|
||||
|
||||
|
@ -159,7 +159,10 @@ static Tox_Event_Friend_Status_Message *tox_events_add_friend_status_message(Tox
|
||||
event.type = TOX_EVENT_FRIEND_STATUS_MESSAGE;
|
||||
event.data.friend_status_message = friend_status_message;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_friend_status_message_free(friend_status_message, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return friend_status_message;
|
||||
}
|
||||
|
||||
|
@ -130,7 +130,10 @@ static Tox_Event_Friend_Typing *tox_events_add_friend_typing(Tox_Events *events,
|
||||
event.type = TOX_EVENT_FRIEND_TYPING;
|
||||
event.data.friend_typing = friend_typing;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_friend_typing_free(friend_typing, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return friend_typing;
|
||||
}
|
||||
|
||||
|
@ -175,7 +175,10 @@ static Tox_Event_Group_Custom_Packet *tox_events_add_group_custom_packet(Tox_Eve
|
||||
event.type = TOX_EVENT_GROUP_CUSTOM_PACKET;
|
||||
event.data.group_custom_packet = group_custom_packet;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_custom_packet_free(group_custom_packet, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_custom_packet;
|
||||
}
|
||||
|
||||
|
@ -175,7 +175,10 @@ static Tox_Event_Group_Custom_Private_Packet *tox_events_add_group_custom_privat
|
||||
event.type = TOX_EVENT_GROUP_CUSTOM_PRIVATE_PACKET;
|
||||
event.data.group_custom_private_packet = group_custom_private_packet;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_custom_private_packet_free(group_custom_private_packet, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_custom_private_packet;
|
||||
}
|
||||
|
||||
|
@ -203,7 +203,10 @@ static Tox_Event_Group_Invite *tox_events_add_group_invite(Tox_Events *events, c
|
||||
event.type = TOX_EVENT_GROUP_INVITE;
|
||||
event.data.group_invite = group_invite;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_invite_free(group_invite, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_invite;
|
||||
}
|
||||
|
||||
|
@ -132,7 +132,10 @@ static Tox_Event_Group_Join_Fail *tox_events_add_group_join_fail(Tox_Events *eve
|
||||
event.type = TOX_EVENT_GROUP_JOIN_FAIL;
|
||||
event.data.group_join_fail = group_join_fail;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_join_fail_free(group_join_fail, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_join_fail;
|
||||
}
|
||||
|
||||
|
@ -209,7 +209,10 @@ static Tox_Event_Group_Message *tox_events_add_group_message(Tox_Events *events,
|
||||
event.type = TOX_EVENT_GROUP_MESSAGE;
|
||||
event.data.group_message = group_message;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_message_free(group_message, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_message;
|
||||
}
|
||||
|
||||
|
@ -164,7 +164,10 @@ static Tox_Event_Group_Moderation *tox_events_add_group_moderation(Tox_Events *e
|
||||
event.type = TOX_EVENT_GROUP_MODERATION;
|
||||
event.data.group_moderation = group_moderation;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_moderation_free(group_moderation, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_moderation;
|
||||
}
|
||||
|
||||
|
@ -159,7 +159,10 @@ static Tox_Event_Group_Password *tox_events_add_group_password(Tox_Events *event
|
||||
event.type = TOX_EVENT_GROUP_PASSWORD;
|
||||
event.data.group_password = group_password;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_password_free(group_password, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_password;
|
||||
}
|
||||
|
||||
|
@ -237,7 +237,10 @@ static Tox_Event_Group_Peer_Exit *tox_events_add_group_peer_exit(Tox_Events *eve
|
||||
event.type = TOX_EVENT_GROUP_PEER_EXIT;
|
||||
event.data.group_peer_exit = group_peer_exit;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_peer_exit_free(group_peer_exit, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_peer_exit;
|
||||
}
|
||||
|
||||
|
@ -130,7 +130,10 @@ static Tox_Event_Group_Peer_Join *tox_events_add_group_peer_join(Tox_Events *eve
|
||||
event.type = TOX_EVENT_GROUP_PEER_JOIN;
|
||||
event.data.group_peer_join = group_peer_join;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_peer_join_free(group_peer_join, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_peer_join;
|
||||
}
|
||||
|
||||
|
@ -130,7 +130,10 @@ static Tox_Event_Group_Peer_Limit *tox_events_add_group_peer_limit(Tox_Events *e
|
||||
event.type = TOX_EVENT_GROUP_PEER_LIMIT;
|
||||
event.data.group_peer_limit = group_peer_limit;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_peer_limit_free(group_peer_limit, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_peer_limit;
|
||||
}
|
||||
|
||||
|
@ -175,7 +175,10 @@ static Tox_Event_Group_Peer_Name *tox_events_add_group_peer_name(Tox_Events *eve
|
||||
event.type = TOX_EVENT_GROUP_PEER_NAME;
|
||||
event.data.group_peer_name = group_peer_name;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_peer_name_free(group_peer_name, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_peer_name;
|
||||
}
|
||||
|
||||
|
@ -148,7 +148,10 @@ static Tox_Event_Group_Peer_Status *tox_events_add_group_peer_status(Tox_Events
|
||||
event.type = TOX_EVENT_GROUP_PEER_STATUS;
|
||||
event.data.group_peer_status = group_peer_status;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_peer_status_free(group_peer_status, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_peer_status;
|
||||
}
|
||||
|
||||
|
@ -132,7 +132,10 @@ static Tox_Event_Group_Privacy_State *tox_events_add_group_privacy_state(Tox_Eve
|
||||
event.type = TOX_EVENT_GROUP_PRIVACY_STATE;
|
||||
event.data.group_privacy_state = group_privacy_state;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_privacy_state_free(group_privacy_state, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_privacy_state;
|
||||
}
|
||||
|
||||
|
@ -209,7 +209,10 @@ static Tox_Event_Group_Private_Message *tox_events_add_group_private_message(Tox
|
||||
event.type = TOX_EVENT_GROUP_PRIVATE_MESSAGE;
|
||||
event.data.group_private_message = group_private_message;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_private_message_free(group_private_message, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_private_message;
|
||||
}
|
||||
|
||||
|
@ -109,7 +109,10 @@ static Tox_Event_Group_Self_Join *tox_events_add_group_self_join(Tox_Events *eve
|
||||
event.type = TOX_EVENT_GROUP_SELF_JOIN;
|
||||
event.data.group_self_join = group_self_join;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_self_join_free(group_self_join, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_self_join;
|
||||
}
|
||||
|
||||
|
@ -175,7 +175,10 @@ static Tox_Event_Group_Topic *tox_events_add_group_topic(Tox_Events *events, con
|
||||
event.type = TOX_EVENT_GROUP_TOPIC;
|
||||
event.data.group_topic = group_topic;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_topic_free(group_topic, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_topic;
|
||||
}
|
||||
|
||||
|
@ -132,7 +132,10 @@ static Tox_Event_Group_Topic_Lock *tox_events_add_group_topic_lock(Tox_Events *e
|
||||
event.type = TOX_EVENT_GROUP_TOPIC_LOCK;
|
||||
event.data.group_topic_lock = group_topic_lock;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_topic_lock_free(group_topic_lock, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_topic_lock;
|
||||
}
|
||||
|
||||
|
@ -132,7 +132,10 @@ static Tox_Event_Group_Voice_State *tox_events_add_group_voice_state(Tox_Events
|
||||
event.type = TOX_EVENT_GROUP_VOICE_STATE;
|
||||
event.data.group_voice_state = group_voice_state;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_group_voice_state_free(group_voice_state, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return group_voice_state;
|
||||
}
|
||||
|
||||
|
@ -111,7 +111,10 @@ static Tox_Event_Self_Connection_Status *tox_events_add_self_connection_status(T
|
||||
event.type = TOX_EVENT_SELF_CONNECTION_STATUS;
|
||||
event.data.self_connection_status = self_connection_status;
|
||||
|
||||
tox_events_add(events, &event);
|
||||
if (!tox_events_add(events, &event)) {
|
||||
tox_event_self_connection_status_free(self_connection_status, mem);
|
||||
return nullptr;
|
||||
}
|
||||
return self_connection_status;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user