[Non-ACR][Major Coverity Fixes]

Change-Id: I7d9d29544d82b9d925acdcebb3df4c2301b50362
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>

diff --git a/server/db/ctsvc_db_plugin_contact.c b/server/db/ctsvc_db_plugin_contact.c
index 0f5befe..de9918e 100644 (file)
--- a/server/db/ctsvc_db_plugin_contact.c
+++ b/server/db/ctsvc_db_plugin_contact.c
@@ -1377,7 +1377,10 @@ static int __ctsvc_db_contact_update_record(contacts_record_h record)
        if (is_invalid) {
                ctsvc_contact_s *temp_contact;
                contacts_record_create(_contacts_contact._uri, (contacts_record_h*)&temp_contact);
+
                ret = __ctsvc_db_get_data(contact->id, temp_contact);
+               WARN_IF(CONTACTS_ERROR_NONE != ret, "__ctsvc_db_get_data() Fail(%d)", ret);
+
                ctsvc_contact_make_display_name(temp_contact);
 
                FREEandSTRDUP(contact->display_name, temp_contact->display_name);
@@ -2076,8 +2079,10 @@ static inline int __ctsvc_find_person_to_link_with_number(const char *number,
                char normal_num[sizeof(clean_num)+20];
                ret = ctsvc_normalize_number(clean_num, normal_num, sizeof(normal_num), true);
                char minmatch[sizeof(normal_num)+1];
-               if (0 < ret)
+               if (0 < ret) {
                        ret = ctsvc_get_minmatch_number(normal_num, minmatch, sizeof(minmatch), ctsvc_get_phonenumber_min_match_digit());
+                       RETVM_IF(ret < CONTACTS_ERROR_NONE, ret, "ctsvc_get_minmatch_number() Fail(%d)", ret);
+               }
 
                snprintf(query, sizeof(query),
                                "SELECT C.person_id FROM "CTS_TABLE_CONTACTS" C, "CTS_TABLE_DATA" D "
@@ -2395,6 +2400,11 @@ static int __ctsvc_db_contact_insert_record(contacts_record_h record, int *id)
        if (contact->numbers) {
                int count;
                ret = contacts_list_get_count((contacts_list_h)contact->numbers, &count);
+               if (ret != CONTACTS_ERROR_NONE) {
+                       ERR("__contacts_list_get_count() Fail(%d)", ret);
+                       ctsvc_end_trans(false);
+                       return ret;
+               }
                contacts_list_first((contacts_list_h)contact->numbers);
                if (0 < count) {
                        ctsvc_number_s *number_record;

diff --git a/server/db/ctsvc_db_plugin_phonelog.c b/server/db/ctsvc_db_plugin_phonelog.c
index 0624e5d..2cabb58 100644 (file)
--- a/server/db/ctsvc_db_plugin_phonelog.c
+++ b/server/db/ctsvc_db_plugin_phonelog.c
@@ -465,6 +465,7 @@ static int  __ctsvc_db_phonelog_insert(ctsvc_phonelog_s *phonelog, int *id)
                                        char minmatch[sizeof(normal_num) + 1];
                                        ctsvc_stmt_bind_copy_text(stmt, 2, normal_num, strlen(normal_num));
                                        ret = ctsvc_get_minmatch_number(normal_num, minmatch, sizeof(minmatch), ctsvc_get_phonenumber_min_match_digit());
+                                       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_get_minmatch_number() Fail(%d)", ret);
                                        ctsvc_stmt_bind_copy_text(stmt, 3, minmatch, strlen(minmatch));
                                }
                        }