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

Merge branch 'master' of git.linphone.org:linphone

Browse source
This commit is contained in:
Sandrine Avakian 2015-12-18 17:13:48 +01:00
commit 150ce1d479
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
coreapi/linphonecore.c
View file

@ -412,7 +412,7 @@ static void clean_log_collection_upload_context(LinphoneCore *lc) {
unlink(filename);
ms_free(filename);
if (lc && lc->log_collection_upload_information) {
ms_free(lc->log_collection_upload_information);
linphone_content_unref(lc->log_collection_upload_information);
lc->log_collection_upload_information=NULL;
}
}
@ -657,8 +657,7 @@ void linphone_core_upload_log_collection(LinphoneCore *core) {
belle_http_request_t *req;
char *name;
core->log_collection_upload_information = (LinphoneContent *)malloc(sizeof(LinphoneContent));
memset(core->log_collection_upload_information, 0, sizeof(LinphoneContent));
core->log_collection_upload_information = linphone_core_create_content(core);
#ifdef HAVE_ZLIB
linphone_content_set_type(core->log_collection_upload_information, "application");
linphone_content_set_subtype(core->log_collection_upload_information, "gzip");
@ -671,7 +670,7 @@ void linphone_core_upload_log_collection(LinphoneCore *core) {
COMPRESSED_LOG_COLLECTION_EXTENSION);
linphone_content_set_name(core->log_collection_upload_information, name);
if (prepare_log_collection_file_to_upload(name) <= 0) {
ms_free(core->log_collection_upload_information);
linphone_content_unref(core->log_collection_upload_information);
core->log_collection_upload_information = NULL;
return;
}