fix some crash

This commit is contained in:
Gautier Pelloux-Prayer 2016-08-29 10:04:22 +02:00
parent 11f2428e8d
commit 76ae2dc43a
2 changed files with 8 additions and 4 deletions

View file

@ -100,9 +100,11 @@ static int linphone_chat_message_file_transfer_on_send_body(belle_sip_user_body_
LinphoneCore *lc = NULL;
char *buf = (char *)buffer;
if (msg->http_request && !file_transfer_in_progress_and_valid(msg)) {
ms_warning("Cancelled request for %s msg [%p], ignoring %s", msg->chat_room?"":"ORPHAN", msg, __FUNCTION__);
_release_http_request(msg);
if (!file_transfer_in_progress_and_valid(msg)) {
if (msg->http_request) {
ms_warning("Cancelled request for %s msg [%p], ignoring %s", msg->chat_room?"":"ORPHAN", msg, __FUNCTION__);
_release_http_request(msg);
}
return BELLE_SIP_STOP;
}

View file

@ -775,7 +775,9 @@ static void eject_from_4_participants_conference(void) {
pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
BC_ASSERT_TRUE(pause_call_1(marie,marie_call_pauline,pauline,pauline_called_by_marie));
BC_ASSERT_TRUE(call(marie,michelle));
if (!BC_ASSERT_TRUE(call(marie,michelle)))
goto end;
marie_call_michelle=linphone_core_get_current_call(marie->lc);
michelle_called_by_marie=linphone_core_get_current_call(michelle->lc);
BC_ASSERT_TRUE(pause_call_1(marie,marie_call_michelle,michelle,michelle_called_by_marie));