From d31bd8dd77ec8b3668091614f89f74d7d86e4bb5 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 15 Jan 2016 14:37:55 +0100 Subject: [PATCH] Few fixes --- coreapi/carddav.c | 3 ++- coreapi/friendlist.c | 4 +++- coreapi/linphonecore.c | 6 ++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/coreapi/carddav.c b/coreapi/carddav.c index ceb782d4a..683b9dddd 100644 --- a/coreapi/carddav.c +++ b/coreapi/carddav.c @@ -617,7 +617,7 @@ void linphone_carddav_fetch_vcards(LinphoneCardDavContext *cdc) { static LinphoneCardDavQuery* linphone_carddav_create_addressbook_multiget_query(LinphoneCardDavContext *cdc, MSList *vcards) { LinphoneCardDavQuery *query = (LinphoneCardDavQuery *)ms_new0(LinphoneCardDavQuery, 1); - char body[(ms_list_size(vcards)+1)*300]; + char *body = (char *)ms_malloc((ms_list_size(vcards) + 1) * 300 * sizeof(char)); MSList *iterator = vcards; query->context = cdc; @@ -639,6 +639,7 @@ static LinphoneCardDavQuery* linphone_carddav_create_addressbook_multiget_query( } sprintf(body, "%s%s", body, ""); query->body = ms_strdup(body); + ms_free(body); return query; } diff --git a/coreapi/friendlist.c b/coreapi/friendlist.c index ca650d9ae..e022014fc 100644 --- a/coreapi/friendlist.c +++ b/coreapi/friendlist.c @@ -383,7 +383,9 @@ LinphoneFriendListStatus _linphone_friend_list_add_friend(LinphoneFriendList *li } LinphoneFriendListStatus linphone_friend_list_add_friend(LinphoneFriendList *list, LinphoneFriend *lf) { - if (lf->uri == NULL || lf->friend_list) { + if (!list || !lf->uri || lf->friend_list) { + if (!list) + ms_error("linphone_friend_list_add_friend(): invalid list, null"); if (!lf->uri) ms_error("linphone_friend_list_add_friend(): invalid friend, no sip uri"); if (lf->friend_list) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index ccadf9465..776506242 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -6494,6 +6494,12 @@ static void linphone_core_uninit(LinphoneCore *lc) if (lc->chat_db_file){ ms_free(lc->chat_db_file); } + if (lc->logs_db_file) { + ms_free(lc->logs_db_file); + } + if (lc->friends_db_file) { + ms_free(lc->friends_db_file); + } if (lc->ringtoneplayer) { linphone_ringtoneplayer_destroy(lc->ringtoneplayer); }