From bd491f32502590212c9ba0295ae934506ce35a20 Mon Sep 17 00:00:00 2001 From: hj kim Date: Fri, 23 Mar 2018 10:16:23 +0900 Subject: [PATCH] Fix Coverity issues Change-Id: Icb277dcd4d500d76a24fdd43dc07d545ca74213c --- lib/media-util-cynara.c | 2 +- src/common/media-common-db-svc.c | 4 ++-- src/scanner-v2/media-scanner-extract-v2.c | 14 +++++++++----- src/scanner-v2/media-scanner-scan-v2.c | 6 +++--- src/scanner/media-scanner-scan.c | 6 +++--- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lib/media-util-cynara.c b/lib/media-util-cynara.c index e53c6d0..882e1ad 100755 --- a/lib/media-util-cynara.c +++ b/lib/media-util-cynara.c @@ -146,7 +146,7 @@ int ms_cynara_receive_untrusted_message(int sockfd, ms_comm_msg_s *recv_msg, ms_ int ms_cynara_receive_untrusted_message_thumb(int sockfd, thumbMsg *recv_msg, ms_peer_credentials *credentials) { int ret = 0; - int header_size = 0; + unsigned int header_size = 0; int recv_msg_size = 0; unsigned char *buf = NULL; diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c index 20c4220..cbbea37 100755 --- a/src/common/media-common-db-svc.c +++ b/src/common/media-common-db-svc.c @@ -320,8 +320,8 @@ void ms_unload_functions(void) int ms_connect_db(void ***handle, uid_t uid) { - int lib_index; - int ret; + int lib_index = 0; + int ret = MS_MEDIA_ERR_NONE; char * err_msg = NULL; /*Lock mutex for openning db*/ diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c index 617ca2d..08521a8 100755 --- a/src/scanner-v2/media-scanner-extract-v2.c +++ b/src/scanner-v2/media-scanner-extract-v2.c @@ -354,6 +354,7 @@ gboolean msc_storage_extract_thread(void *data) uid_t uid = MEDIA_DEFAULT_UID; int disc_state = 0; int end_flag = NORMAL_EVENT; + int tem_ret = MS_MEDIA_ERR_NONE; while (1) { __msc_set_storage_extract_status(MS_STORAGE_SCAN_DONE); @@ -424,7 +425,7 @@ gboolean msc_storage_extract_thread(void *data) __msc_pause_extract(); MS_DBG_WARN("extract RESUME"); - int tem_ret = __msc_check_extract_stop_status(extract_data->msg_type, update_path, extract_data->pid, end_flag); + tem_ret = __msc_check_extract_stop_status(extract_data->msg_type, update_path, extract_data->pid, end_flag); if (tem_ret == MS_MEDIA_ERR_SCANNER_FORCE_STOP) { ms_set_storage_scan_status(handle, extract_data->storage_id, MEDIA_EXTRACT_STOP, uid); __msc_set_storage_extract_status(MS_STORAGE_SCAN_META_STOP); @@ -529,6 +530,9 @@ void msc_insert_exactor_request(int message_type, bool ins_status, const char *s int msc_remove_extract_request(const ms_comm_msg_s *recv_msg) { + int i = 0; + int j = 0; + if (recv_msg == NULL) { MS_DBG_ERR("recv_msg is null"); return MS_MEDIA_ERR_INVALID_PARAMETER; @@ -547,8 +551,8 @@ int msc_remove_extract_request(const ms_comm_msg_s *recv_msg) } temp_queue = g_async_queue_new(); - int i = 0; - for (; i < len; i++) { + + for (i = 0; i < len; i++) { /*create new queue to compare request*/ msg = g_async_queue_pop(storage_extract_queue); if ((strcmp(msg->storage_id, storageid) == 0)) { @@ -563,8 +567,8 @@ int msc_remove_extract_request(const ms_comm_msg_s *recv_msg) } } len = g_async_queue_length(temp_queue); - int j = 0; - for (; j < len; j++) { + + for (j = 0; j < len; j++) { msg = g_async_queue_pop(temp_queue); if (msg) g_async_queue_push(storage_extract_queue, GINT_TO_POINTER(msg)); diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c index 43cbd9d..ab50665 100755 --- a/src/scanner-v2/media-scanner-scan-v2.c +++ b/src/scanner-v2/media-scanner-scan-v2.c @@ -1702,6 +1702,7 @@ gboolean msc_register_thread(void *data) int pid = 0; ms_msg_type_e current_msg = MS_MSG_MAX; uid_t uid = MEDIA_DEFAULT_UID; + ms_comm_msg_s *msg_data = NULL; /*create array for processing overlay data*/ register_array = g_array_new(FALSE, FALSE, sizeof(ms_comm_msg_s *)); @@ -1772,10 +1773,9 @@ _POWEROFF: MS_SAFE_FREE(register_data); if (register_array) { while (register_array->len != 0) { - ms_comm_msg_s *data = NULL; - data = g_array_index(register_array , ms_comm_msg_s*, 0); + msg_data = g_array_index(register_array , ms_comm_msg_s*, 0); g_array_remove_index(register_array, 0); - MS_SAFE_FREE(data); + MS_SAFE_FREE(msg_data); } g_array_free(register_array, FALSE); register_array = NULL; diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c index 9d32e6b..65515e1 100755 --- a/src/scanner/media-scanner-scan.c +++ b/src/scanner/media-scanner-scan.c @@ -659,6 +659,7 @@ gboolean msc_register_thread(void *data) int ret = MS_MEDIA_ERR_NONE; int pid = 0; ms_msg_type_e current_msg = MS_MSG_MAX; + ms_comm_msg_s *msg_data = NULL; /*create array for processing overlay data*/ register_array = g_array_new(FALSE, FALSE, sizeof(ms_comm_msg_s *)); @@ -727,10 +728,9 @@ _POWEROFF: MS_SAFE_FREE(register_data); if (register_array) { while (register_array->len != 0) { - ms_comm_msg_s *data = NULL; - data = g_array_index(register_array , ms_comm_msg_s*, 0); + msg_data = g_array_index(register_array , ms_comm_msg_s*, 0); g_array_remove_index(register_array, 0); - MS_SAFE_FREE(data); + MS_SAFE_FREE(msg_data); } g_array_free(register_array, FALSE); register_array = NULL; -- 2.7.4