From fc8d072a6490a04abdfcef867ae4734602851ff1 Mon Sep 17 00:00:00 2001 From: Abhishek Vijay Date: Tue, 20 Mar 2018 18:12:06 +0530 Subject: [PATCH] [SVACE Issue Fixes] Signed-off-by: Abhishek Vijay Change-Id: Ia94c8784d3e4d5778a5f2477fc5828873b9c589d --- server/ctsvc_ipc_server.c | 2 +- server/ctsvc_ipc_server2.c | 8 ++++---- server/db/ctsvc_db_plugin_name_helper.c | 8 ++++++++ server/db/ctsvc_db_query.c | 4 ++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/server/ctsvc_ipc_server.c b/server/ctsvc_ipc_server.c index c2536a3..dec01c2 100644 --- a/server/ctsvc_ipc_server.c +++ b/server/ctsvc_ipc_server.c @@ -2822,7 +2822,7 @@ void ctsvc_ipc_server_db_get_status(pims_ipc_h ipc, pims_ipc_data_h indata, pims_ipc_data_h *outdata, void *userdata) { int ret = CONTACTS_ERROR_NONE; - contacts_db_status_e status; + contacts_db_status_e status = CONTACTS_DB_STATUS_NORMAL; contacts_h contact = NULL; if (indata) { diff --git a/server/ctsvc_ipc_server2.c b/server/ctsvc_ipc_server2.c index 72661fa..6acfe76 100644 --- a/server/ctsvc_ipc_server2.c +++ b/server/ctsvc_ipc_server2.c @@ -553,6 +553,7 @@ void ctsvc_ipc_person_unlink_contact(pims_ipc_h ipc, pims_ipc_data_h indata, pim int ret = CONTACTS_ERROR_NONE; int person_id = 0; int contact_id = 0; + int unlinked_person_id = 0; contacts_h contact = NULL; if (indata) { @@ -591,7 +592,6 @@ void ctsvc_ipc_person_unlink_contact(pims_ipc_h ipc, pims_ipc_data_h indata, pim /* LCOV_EXCL_STOP */ } - int unlinked_person_id; ret = ctsvc_person_unlink_contact(person_id, contact_id, &unlinked_person_id); ERROR_RETURN: @@ -919,7 +919,7 @@ void ctsvc_ipc_person_get_default_property(pims_ipc_h ipc, pims_ipc_data_h indat { int ret = CONTACTS_ERROR_NONE; int person_id = 0; - int id; + int id = 0; contacts_person_property_e op; contacts_h contact = NULL; if (indata) { @@ -1337,7 +1337,7 @@ void ctsvc_ipc_setting_get_name_display_order(pims_ipc_h ipc, pims_ipc_data_h in pims_ipc_data_h *outdata, void *userdata) { int ret = CONTACTS_ERROR_NONE; - contacts_name_display_order_e order; + contacts_name_display_order_e order = CONTACTS_NAME_DISPLAY_ORDER_FIRSTLAST; if (!ctsvc_have_permission(ipc, CTSVC_PERMISSION_CONTACT_READ)) { /* LCOV_EXCL_START */ @@ -1390,7 +1390,7 @@ void ctsvc_ipc_setting_get_name_sorting_order(pims_ipc_h ipc, pims_ipc_data_h in pims_ipc_data_h *outdata, void *userdata) { int ret = CONTACTS_ERROR_NONE; - contacts_name_sorting_order_e order; + contacts_name_sorting_order_e order = CONTACTS_NAME_SORTING_ORDER_FIRSTLAST; if (!ctsvc_have_permission(ipc, CTSVC_PERMISSION_CONTACT_READ)) { ret = CONTACTS_ERROR_PERMISSION_DENIED; diff --git a/server/db/ctsvc_db_plugin_name_helper.c b/server/db/ctsvc_db_plugin_name_helper.c index deac247..ab227e6 100644 --- a/server/db/ctsvc_db_plugin_name_helper.c +++ b/server/db/ctsvc_db_plugin_name_helper.c @@ -179,6 +179,10 @@ int ctsvc_db_name_insert(contacts_record_h record, int contact_id, bool is_my_pr len_normal_first = SAFE_STRLEN(normal_name[CTSVC_NN_FIRST]); len_normal_last = SAFE_STRLEN(normal_name[CTSVC_NN_LAST]); temp_normal_first = calloc(1, len_normal_first + len_normal_last + 1); + if (temp_normal_first == NULL) { + ERR("calloc() Fail"); + return CONTACTS_ERROR_OUT_OF_MEMORY; + } if (normal_name[CTSVC_NN_LAST]) { len = snprintf(temp_normal_first, len_normal_first + len_normal_last + 1, "%s", normal_name[CTSVC_NN_LAST]); @@ -321,6 +325,10 @@ int ctsvc_db_name_update(contacts_record_h record, bool is_my_profile) switch (ret) { case CTSVC_LANG_KOREAN: temp_normal_first = calloc(1, SAFE_STRLEN(normal_name[CTSVC_NN_LAST]) + SAFE_STRLEN(normal_name[CTSVC_NN_LAST]) + 1); + if (temp_normal_first == NULL) { + ERR("calloc() Fail"); + return CONTACTS_ERROR_OUT_OF_MEMORY; + } if (normal_name[CTSVC_NN_LAST]) { len = snprintf(temp_normal_first, SAFE_STRLEN(normal_name[CTSVC_NN_LAST]) + SAFE_STRLEN(normal_name[CTSVC_NN_LAST]) + 1, "%s", normal_name[CTSVC_NN_LAST]); diff --git a/server/db/ctsvc_db_query.c b/server/db/ctsvc_db_query.c index ff3efce..cad20ae 100644 --- a/server/db/ctsvc_db_query.c +++ b/server/db/ctsvc_db_query.c @@ -613,6 +613,10 @@ static char *_get_search_query_for_number(const char *keyword) do { int len_keyword = strlen(half_keyword); char *clean_number = calloc(len_keyword + 1, sizeof(char)); + if (clean_number == NULL) { + ERR("Memory allocation failure : ctsvc_clean_number() fail "); + break; + } int err = ctsvc_clean_number(half_keyword, clean_number, len_keyword + 1, false); if (err <= 0) { /* LCOV_EXCL_START */ -- 2.7.4