From 55a9850b38066058c65290296519b72cdf46973b Mon Sep 17 00:00:00 2001 From: QuentinArguillere Date: Wed, 16 Jun 2021 15:28:56 +0200 Subject: [PATCH] Fix a crash that could happen when changing view while deleting a chatroom --- Classes/ChatsListTableView.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Classes/ChatsListTableView.m b/Classes/ChatsListTableView.m index 3c7e3ce0a..ae6ad0196 100644 --- a/Classes/ChatsListTableView.m +++ b/Classes/ChatsListTableView.m @@ -63,7 +63,11 @@ if (!chatRoom) continue; - linphone_chat_room_remove_callbacks(chatRoom, linphone_chat_room_get_current_callbacks(chatRoom)); + + LinphoneChatRoomCbs *cbs = linphone_chat_room_get_current_callbacks(chatRoom); + if (cbs) {// If the view is getting changed while a chatroom deletion is in progress, the callbacks may already have been deleted despite the chatroom still being there, causing a potential crash. + linphone_chat_room_remove_callbacks(chatRoom, cbs); + } _chatRooms = _chatRooms->next; } }