From 9c998b7297dbfc40c1ec3e128be6c90eef3bfc6d Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Wed, 7 Feb 2018 11:04:46 +0900 Subject: [PATCH] [SATIZENVUL-1315/SATIZENVUL-1316] Remove msg_size from dcmMsg Change-Id: I4709d2e8afb1821f0d354630ba20016d012a7104 Signed-off-by: Minje Ahn --- src/dcm_svc_ipc.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/src/dcm_svc_ipc.c b/src/dcm_svc_ipc.c index 8ff5440..e41f576 100755 --- a/src/dcm_svc_ipc.c +++ b/src/dcm_svc_ipc.c @@ -43,7 +43,7 @@ int dcm_ipc_receive_message(int client_sock, dcmMsg *recv_msg) return MS_MEDIA_ERR_SOCKET_RECEIVE; } } - dcm_sec_debug("[receive msg] type: %d, pid: %d, uid: %d, msg: %s, msg_size: %d", recv_msg->msg_type, recv_msg->pid, recv_msg->uid, (recv_msg->msg) ? recv_msg->msg : "NULL", recv_msg->msg_size); + dcm_sec_debug("[receive msg] type[%d] pid[%d] uid[%d] msg[%s]", recv_msg->msg_type, recv_msg->pid, recv_msg->uid, (recv_msg->msg) ? recv_msg->msg : "NULL"); if (!(recv_msg->msg_type >= 0 && recv_msg->msg_type < DCM_MSG_MAX)) { dcm_error("IPC message is wrong!"); @@ -169,17 +169,8 @@ int dcm_ipc_send_client_message(int socket_fd, ms_dcm_msg_type_e msg_type, unsig memset((void *)&send_msg, 0, sizeof(dcmMsg)); send_msg.msg_type = msg_type; send_msg.result = (int)result; - if (msg != NULL) { - send_msg.msg_size = strlen(msg); - g_strlcpy(send_msg.msg, msg, DCM_IPC_MSG_MAX_SIZE); - } - - /* If message size is larget than max_size, then message is invalid */ - if (send_msg.msg_size >= DCM_IPC_MSG_MAX_SIZE) { - dcm_error("Message size is invalid!"); - close(sock); - return MS_MEDIA_ERR_INVALID_IPC_MESSAGE; - } + if (msg != NULL) + DCM_SAFE_STRLCPY(send_msg.msg, msg, DCM_IPC_MSG_MAX_SIZE); /* Send msg to the socket */ if (send(sock, &send_msg, sizeof(send_msg), 0) != sizeof(send_msg)) { @@ -215,14 +206,7 @@ int dcm_ipc_send_message(ms_dcm_msg_type_e msg_type, uid_t uid, const char *msg, send_msg.msg_type = msg_type; send_msg.uid = uid; if (msg != NULL) { - send_msg.msg_size = strlen(msg); - g_strlcpy(send_msg.msg, msg, DCM_IPC_MSG_MAX_SIZE); - } - - /* If message size is larget than max_size, then message is invalid */ - if (send_msg.msg_size >= DCM_IPC_MSG_MAX_SIZE) { - dcm_error("Message size is invalid!"); - return MS_MEDIA_ERR_SOCKET_SEND; + DCM_SAFE_STRLCPY(send_msg.msg, msg, DCM_IPC_MSG_MAX_SIZE); } /* Create a new TCP socket */ -- 2.34.1