mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-26 15:48:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Attempt to fix __stack_chk_fail crash on MacOSX

Browse source
This commit is contained in:
Sylvain Berfini 2016-01-27 15:20:46 +01:00
parent 5c0bdf95bd
commit 5a7d0a0773
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
coreapi/carddav.c
View file

@ -494,8 +494,17 @@ void linphone_carddav_put_vcard(LinphoneCardDavContext *cdc, LinphoneFriend *lf)
if (!linphone_vcard_get_url(lvc)) {
char *url = generate_url_from_server_address_and_uid(cdc->friend_list->uri);
linphone_vcard_set_url(lvc, url);
ms_free(url);
if (url) {
linphone_vcard_set_url(lvc, url);
ms_free(url);
} else {
const char *msg = "vCard doesn't have an URL, and friendlist doesn't have a CardDAV server set either, can't push it";
ms_warning(msg);
if (cdc && cdc->sync_done_cb) {
cdc->sync_done_cb(cdc, FALSE, msg);
}
return;
}
}
query = linphone_carddav_create_put_query(cdc, lvc);
@ -505,8 +514,10 @@ void linphone_carddav_put_vcard(LinphoneCardDavContext *cdc, LinphoneFriend *lf)
const char *msg = NULL;
if (!lvc) {
msg = "LinphoneVCard is NULL";
} else if (!linphone_vcard_get_url(lvc)) {
} else if (!linphone_vcard_get_uid(lvc)) {
msg = "LinphoneVCard doesn't have an UID";
} else {
msg = "Unknown error";
}
if (msg) {