Fix coverity issue

Change-Id: I1ca40a1464ecb22332cc5bd7cb344ac973773f6d
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/lib/include/media-util-ipc.h b/lib/include/media-util-ipc.h
index 70878c1..9c7e70f 100755 (executable)
--- a/lib/include/media-util-ipc.h
+++ b/lib/include/media-util-ipc.h
@@ -49,7 +49,6 @@ int ms_ipc_create_client_socket(int timeout_sec, int *sock_fd);
 int ms_ipc_create_server_socket(ms_msg_port_type_e port, int *sock_fd);
 int ms_ipc_send_msg_to_server_tcp(int sockfd, ms_msg_port_type_e port, ms_comm_msg_s *send_msg, struct sockaddr_un *serv_addr);
 int ms_ipc_send_msg_to_client_tcp(int sockfd, ms_comm_msg_s *send_msg, struct sockaddr_un *client_addr);
-int ms_ipc_receive_message(int sockfd, void *recv_msg);
 int ms_ipc_receive_message_tcp(int client_sock, ms_comm_msg_s *recv_msg);
 int ms_ipc_accept_client_tcp(int serv_sock, int* client_sock);
 

diff --git a/lib/media-util-cynara.c b/lib/media-util-cynara.c
index 099b4d1..e53c6d0 100755 (executable)
--- a/lib/media-util-cynara.c
+++ b/lib/media-util-cynara.c
@@ -115,12 +115,12 @@ int ms_cynara_receive_untrusted_message(int sockfd, ms_comm_msg_s *recv_msg, ms_
        MSAPI_DBG_SLOG("receive msg from P[%d] T[%d] M[%.*s] S[%.*s]", recv_msg->pid, recv_msg->msg_type, MAX_MSG_SIZE, recv_msg->msg, MS_UUID_SIZE, recv_msg->storage_id);
 
        if (strlen(recv_msg->msg) == 0 || strlen(recv_msg->msg) >= MAX_MSG_SIZE) {
-               MSAPI_DBG_ERR("IPC message is wrong. message size is %d", strlen(recv_msg->msg));
+               MSAPI_DBG_ERR("IPC message is wrong. message size is over MAX_MSG_SIZE");
                return MS_MEDIA_ERR_INVALID_IPC_MESSAGE;
        }
 
        if (strlen(recv_msg->storage_id) >= MS_UUID_SIZE) {
-               MSAPI_DBG_ERR("IPC message is wrong. storage_id size is %d", strlen(recv_msg->storage_id));
+               MSAPI_DBG_ERR("IPC message is wrong. storage_id size is over MS_UUID_SIZE");
                return MS_MEDIA_ERR_INVALID_IPC_MESSAGE;
        }
 

diff --git a/lib/media-util-dcm.c b/lib/media-util-dcm.c
index 87e3ac0..18e368d 100755 (executable)
--- a/lib/media-util-dcm.c
+++ b/lib/media-util-dcm.c
@@ -153,7 +153,7 @@ gboolean __media_dcm_write_socket(GIOChannel *src, GIOCondition condition, gpoin
        }
 
        if (strlen(recv_msg.msg) == 0 || strlen(recv_msg.msg) >= MAX_FILEPATH_LEN) {
-               MSAPI_DBG_ERR("msg size is invlid[%d]", strlen(recv_msg.msg));
+               MSAPI_DBG_ERR("msg size is invlid");
                return FALSE;
        }
 

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
index fa3aca2..2021c64 100755 (executable)
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -153,7 +153,7 @@ int ms_ipc_send_msg_to_server_tcp(int sockfd, ms_msg_port_type_e port, ms_comm_m
 int ms_ipc_send_msg_to_client_tcp(int sockfd, ms_comm_msg_s *send_msg, struct sockaddr_un *client_addr)
 {
        if (write(sockfd, send_msg, sizeof(*(send_msg))) != sizeof(*(send_msg))) {
-               MSAPI_DBG_STRERROR("sendto failed");
+               MSAPI_DBG_STRERROR("write failed");
                return MS_MEDIA_ERR_SOCKET_SEND;
        }
 
@@ -162,25 +162,6 @@ int ms_ipc_send_msg_to_client_tcp(int sockfd, ms_comm_msg_s *send_msg, struct so
        return MS_MEDIA_ERR_NONE;
 }
 
-int ms_ipc_receive_message(int sockfd, void *recv_msg)
-{
-       int recv_msg_size;
-
-       MSAPI_RETV_IF(recv_msg == NULL, MS_MEDIA_ERR_INVALID_PARAMETER);
-
-       if ((recv_msg_size = read(sockfd, recv_msg, sizeof(ms_comm_msg_s))) < 0) {
-               if (errno == EWOULDBLOCK) {
-                       MSAPI_DBG_ERR("Timeout. Can't try any more");
-                       return MS_MEDIA_ERR_SOCKET_RECEIVE_TIMEOUT;
-               } else {
-                       MSAPI_DBG_STRERROR("recv failed");
-                       return MS_MEDIA_ERR_SOCKET_RECEIVE;
-               }
-       }
-
-       return MS_MEDIA_ERR_NONE;
-}
-
 int ms_ipc_accept_client_tcp(int serv_sock, int* client_sock)
 {
        int sockfd = -1;
@@ -218,7 +199,7 @@ int ms_ipc_receive_message_tcp(int client_sock, ms_comm_msg_s *recv_msg)
        MSAPI_DBG_SLOG("receive msg from P[%d] T[%d] M[%.*s]", recv_msg->pid, recv_msg->msg_type, MAX_MSG_SIZE, recv_msg->msg);
 
        if (strlen(recv_msg->msg) == 0 || strlen(recv_msg->msg) >= MAX_MSG_SIZE) {
-               MSAPI_DBG_ERR("IPC message is wrong. message size is %d", strlen(recv_msg->msg));
+               MSAPI_DBG_ERR("IPC message is wrong. message size is over MAX_MSG_SIZE");
                return MS_MEDIA_ERR_INVALID_IPC_MESSAGE;
        }
 

diff --git a/src/scanner-v2/media-scanner-socket-v2.c b/src/scanner-v2/media-scanner-socket-v2.c
index 900582a..0f1fd36 100755 (executable)
--- a/src/scanner-v2/media-scanner-socket-v2.c
+++ b/src/scanner-v2/media-scanner-socket-v2.c
@@ -162,12 +162,14 @@ gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer d
        }
 
        if (strlen(recv_msg->msg) == 0 || strlen(recv_msg->msg) >= MAX_MSG_SIZE) {
-               MS_DBG_ERR("msg size is invlid[%d]", strlen(recv_msg->msg));
+               MS_DBG_ERR("msg size is invlid");
+               MS_SAFE_FREE(recv_msg);
                return TRUE;
        }
 
        if (strlen(recv_msg->storage_id) >= MS_UUID_SIZE) {
-               MS_DBG_ERR("storage_id size is invlid[%d]", strlen(recv_msg->storage_id));
+               MS_DBG_ERR("storage_id size is invlid");
+               MS_SAFE_FREE(recv_msg);
                return TRUE;
        }
 

diff --git a/src/scanner/media-scanner-socket.c b/src/scanner/media-scanner-socket.c
index cc13b1d..3f77bb0 100755 (executable)
--- a/src/scanner/media-scanner-socket.c
+++ b/src/scanner/media-scanner-socket.c
@@ -61,12 +61,14 @@ gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer d
        }
 
        if (strlen(recv_msg->msg) == 0 || strlen(recv_msg->msg) >= MAX_MSG_SIZE) {
-               MS_DBG_ERR("msg size is invlid[%d]", strlen(recv_msg->msg));
+               MS_DBG_ERR("msg size is invlid");
+               MS_SAFE_FREE(recv_msg);
                return TRUE;
        }
 
        if (strlen(recv_msg->storage_id) >= MS_UUID_SIZE) {
-               MS_DBG_ERR("storage_id size is invlid[%d]", strlen(recv_msg->storage_id));
+               MS_DBG_ERR("storage_id size is invlid");
+               MS_SAFE_FREE(recv_msg);
                return TRUE;
        }
 

diff --git a/src/server/media-server-dcm.c b/src/server/media-server-dcm.c
index 6d67987..227dd7b 100755 (executable)
--- a/src/server/media-server-dcm.c
+++ b/src/server/media-server-dcm.c
@@ -120,6 +120,7 @@ int __ms_dcm_recv_msg(int sock, dcmMsg *msg)
 
        if (strlen(msg->msg) >= MAX_FILEPATH_LEN) {
                MS_DBG_ERR("msg size is invlid[%d]", strlen(msg->msg));
+               MS_SAFE_FREE(buf);
                return MS_MEDIA_ERR_INVALID_IPC_MESSAGE;
        }
 

diff --git a/src/server/media-server-device-block.c b/src/server/media-server-device-block.c
index ca929fa..a204915 100755 (executable)
--- a/src/server/media-server-device-block.c
+++ b/src/server/media-server-device-block.c
@@ -718,6 +718,9 @@ int ms_check_mounted_storage(uid_t uid)
                                }
                        }
 
+                       if (ret != MS_MEDIA_ERR_NONE)
+                               MS_DBG_ERR("error : ms_update_storage or ms_insert_storage failed");
+
                        /* request to update media db */
                        ret = ms_insert_folder(handle, storage_id, mounted_path, uid);
                        if (ret != MS_MEDIA_ERR_NONE)

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index 973cacc..c4f30b3 100755 (executable)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -534,12 +534,14 @@ static void __ms_add_event_receiver(GIOChannel *channel)
                MS_DBG("Set language change cb [%s]", lang);
 
                priv_lang = strdup(lang);
-               MS_SAFE_FREE(lang);
 
                err = vconf_notify_key_changed(VCONFKEY_LANGSET, (vconf_callback_fn) _ms_change_lang_vconf_cb, NULL);
                if (err == -1)
                        MS_DBG_ERR("add call back function for event %s fails", VCONFKEY_LANGSET);
        }
+
+       MS_SAFE_FREE(lang);
+
 #endif
 #ifdef _USE_SENIOR_MODE
        /*add noti receiver for smart hub reset */

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index 222cbe5..9b93929 100755 (executable)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -868,12 +868,12 @@ gboolean ms_receive_message_from_scanner(GIOChannel *src, GIOCondition condition
        }
 
        if (strlen(recv_msg.msg) == 0 || strlen(recv_msg.msg) >= MAX_MSG_SIZE) {
-               MS_DBG_ERR("msg size is invlid[%d]", strlen(recv_msg.msg));
+               MS_DBG_ERR("msg size is invlid");
                return TRUE;
        }
 
        if (strlen(recv_msg.storage_id) >= MS_UUID_SIZE) {
-               MS_DBG_ERR("storage_id size is invlid[%d]", strlen(recv_msg.storage_id));
+               MS_DBG_ERR("storage_id size is invlid");
                return TRUE;
        }
 

diff --git a/src/server/media-server-thumb.c b/src/server/media-server-thumb.c
index 7071d3c..f99a138 100755 (executable)
--- a/src/server/media-server-thumb.c
+++ b/src/server/media-server-thumb.c
@@ -219,7 +219,8 @@ gboolean _ms_thumb_agent_recv_msg_from_server()
 {
        struct sockaddr_un serv_addr;
        unsigned int serv_addr_len;
-
+       ms_thumb_server_msg recv_msg;
+       int len = 0;
        int sockfd = -1;
 
        if (g_communicate_sock <= 0)
@@ -232,17 +233,12 @@ gboolean _ms_thumb_agent_recv_msg_from_server()
                return FALSE;
        }
 
-       ms_thumb_server_msg recv_msg;
-       int recv_msg_size = 0;
-
-       recv_msg_size = ms_ipc_receive_message(sockfd, &recv_msg);
-       if (recv_msg_size != MS_MEDIA_ERR_NONE) {
-               MS_DBG_STRERROR("ms_ipc_receive_message failed");
+       if ((len = read(sockfd, &recv_msg, sizeof(ms_thumb_server_msg))) < 0) {
+               MS_DBG_STRERROR("read failed");
                close(sockfd);
                return FALSE;
        }
 
-       //MS_DBG("Receive : %d(%d)", recv_msg.msg_type, recv_msg_size);
        if (recv_msg.msg_type == MS_MSG_THUMB_SERVER_READY)
                MS_DBG("Thumbnail server is ready");
 
@@ -442,7 +438,7 @@ gboolean _ms_thumb_request_to_server(gpointer data)
                        _ms_thumb_set_buffer(&res_msg, &buf, &buf_size);
 
                        if (send(client_sock, buf, buf_size, 0) < 0)
-                               MS_DBG_STRERROR("sendto failed");
+                               MS_DBG_STRERROR("send failed");
                        else
                                MS_DBG("Sent Refuse msg from %s", recv_msg->org_path);