mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-18 03:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix last found by liblinphone_tester in carddav part

Browse source
This commit is contained in:
Sylvain Berfini 2016-01-11 12:10:11 +01:00
parent 379ac0e21e
commit cd6409da3f
3 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
coreapi/carddav.c
View file

@ -281,6 +281,19 @@ end:
return result;
}
static void linphone_carddav_query_free(LinphoneCardDavQuery *query) {
if (!query) {
return;
}
if (query->http_request_listener) {
belle_sip_object_unref(query->http_request_listener);
query->http_request_listener = NULL;
}
ms_free(query);
}
static void process_response_from_carddav_request(void *data, const belle_http_response_event_t *event) {
LinphoneCardDavQuery *query = (LinphoneCardDavQuery *)data;
@ -347,13 +360,13 @@ static void process_response_from_carddav_request(void *data, const belle_http_r
} else {
linphone_carddav_sync_done(query->context, FALSE, "No response found");
}
ms_free(query);
linphone_carddav_query_free(query);
}
static void process_io_error_from_carddav_request(void *data, const belle_sip_io_error_event_t *event) {
LinphoneCardDavQuery *query = (LinphoneCardDavQuery *)data;
ms_error("I/O error during CardDAV request sending");
ms_free(query);
linphone_carddav_query_free(query);
linphone_carddav_sync_done(query->context, FALSE, "I/O error during CardDAV request sending");
}
@ -371,13 +384,13 @@ static void process_auth_requested_from_carddav_request(void *data, belle_sip_au
}
} else {
ms_error("Authentication requested during CardDAV request sending, and username/password weren't provided");
linphone_carddav_query_free(query);
linphone_carddav_sync_done(query->context, FALSE, "Authentication requested during CardDAV request sending, and username/password weren't provided");
}
}
static void linphone_carddav_send_query(LinphoneCardDavQuery *query) {
belle_http_request_listener_callbacks_t cbs = { 0 };
belle_http_request_listener_t *l = NULL;
belle_generic_uri_t *uri = NULL;
belle_http_request_t *req = NULL;
belle_sip_memory_body_handler_t *bh = NULL;
@ -419,8 +432,8 @@ static void linphone_carddav_send_query(LinphoneCardDavQuery *query) {
cbs.process_response = process_response_from_carddav_request;
cbs.process_io_error = process_io_error_from_carddav_request;
cbs.process_auth_requested = process_auth_requested_from_carddav_request;
l = belle_http_request_listener_create_from_callbacks(&cbs, query);
belle_http_provider_send_request(query->context->lc->http_provider, req, l);
query->http_request_listener = belle_http_request_listener_create_from_callbacks(&cbs, query);
belle_http_provider_send_request(query->context->lc->http_provider, req, query->http_request_listener);
}
static LinphoneCardDavQuery* linphone_carddav_create_put_query(LinphoneCardDavContext *cdc, LinphoneVCard *lvc) {

1
coreapi/private.h
View file

@ -1245,6 +1245,7 @@ struct _LinphoneCardDavQuery {
const char *body;
const char *depth;
const char *ifmatch;
belle_http_request_listener_t *http_request_listener;
void *user_data;
LinphoneCardDavQueryType type;
};

6
tester/vcard_tester.c
View file

@ -91,7 +91,7 @@ static void friends_if_no_db_set(void) {
friends = linphone_core_get_friend_list(manager->lc);
BC_ASSERT_EQUAL(ms_list_size(friends), 0, int, "%d");
linphone_address_destroy(addr);
linphone_address_unref(addr);
linphone_core_manager_destroy(manager);
}
@ -117,7 +117,7 @@ static void friends_migration(void) {
end:
unlink(friends_db);
ms_free(friends_db);
linphone_address_destroy(addr);
linphone_address_unref(addr);
friends_from_db = ms_list_free_with_data(friends_from_db, (void (*)(void *))linphone_friend_unref);
linphone_core_manager_destroy(manager);
}
@ -184,7 +184,7 @@ static void friends_sqlite_storage(void) {
end:
unlink(friends_db);
ms_free(friends_db);
linphone_address_destroy(addr);
linphone_address_unref(addr);
friends_from_db = ms_list_free_with_data(friends_from_db, (void (*)(void *))linphone_friend_unref);
linphone_core_manager_destroy(manager);
}