mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix crashes with new error info

Browse source
This commit is contained in:
Simon Morlat 2017-04-15 13:02:08 +02:00
parent 2637c2a15e
commit 6ac8f1505f
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
coreapi/bellesip_sal/sal_op_impl.c
View file

@ -585,10 +585,6 @@ void sal_error_info_reset(SalErrorInfo *ei){
ms_free(ei->protocol);
ei->protocol = NULL;
}
if (ei->sub_sei){
ms_free(ei->sub_sei);
ei->sub_sei = NULL;
}
ei->protocol_code=0;
ei->reason=SalReasonNone;
ei->sub_sei = NULL;

24
coreapi/linphonecall.c
View file

@ -5151,7 +5151,6 @@ LinphoneStatus linphone_call_terminate_with_error_info(LinphoneCall *call , cons
return -1;
case LinphoneCallIncomingReceived:
case LinphoneCallIncomingEarlyMedia:
linphone_error_info_set_reason(p_ei, LinphoneReasonDeclined);
return linphone_call_decline_with_error_info(call, p_ei);
case LinphoneCallOutgoingInit:
/* In state OutgoingInit, op has to be destroyed */
@ -5208,13 +5207,12 @@ LinphoneStatus linphone_call_redirect(LinphoneCall *call, const char *redirect_u
}
LinphoneStatus linphone_call_decline(LinphoneCall * call, LinphoneReason reason) {
if ((call->state != LinphoneCallIncomingReceived) && (call->state != LinphoneCallIncomingEarlyMedia)) {
ms_error("Cannot decline a call that is in state %s", linphone_call_state_to_string(call->state));
return -1;
}
sal_call_decline(call->op, linphone_reason_to_sal(reason), NULL);
terminate_call(call);
return 0;
LinphoneStatus status;
LinphoneErrorInfo *ei = linphone_error_info_new();
linphone_error_info_set(ei, "SIP", reason,linphone_reason_to_error_code(reason), NULL, NULL);
status = linphone_call_decline_with_error_info(call, ei);
return status;
}
@ -5228,8 +5226,14 @@ LinphoneStatus linphone_call_decline_with_error_info(LinphoneCall * call, const
ms_error("Cannot decline a call that is in state %s", linphone_call_state_to_string(call->state));
return -1;
}
linphone_error_info_to_sal(ei, &sei);
sal_call_decline_with_error_info(call->op, &sei , NULL);
if (ei) {
linphone_error_info_to_sal(ei, &sei);
sal_call_decline_with_error_info(call->op, &sei , NULL);
}else{
sal_call_decline(call->op, SalReasonDeclined, NULL);
}
sal_error_info_reset(&sei);
sal_error_info_reset(&sub_sei);
terminate_call(call);
return 0;
}