From 00f79f3bdcfd7612c1d9ac6d6885095a63b82311 Mon Sep 17 00:00:00 2001 From: Jiyong Min Date: Wed, 5 Jul 2017 15:10:07 +0900 Subject: [PATCH] Fix that socket binding was not connected by wrong address Change-Id: Iaa2df51a27c8fd3d083dfa61186723385ee8f1ba Signed-off-by: Jiyong Min --- packaging/dcm-service.spec | 2 +- src/dcm_svc_ipc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/dcm-service.spec b/packaging/dcm-service.spec index 284e986..596aa1a 100755 --- a/packaging/dcm-service.spec +++ b/packaging/dcm-service.spec @@ -1,6 +1,6 @@ Name: dcm-service Summary: A media DCM(Digital Contents Management) Service -Version: 0.1.2 +Version: 0.1.3 Release: 0 Group: Multimedia/Service License: Apache-2.0 diff --git a/src/dcm_svc_ipc.c b/src/dcm_svc_ipc.c index 7ee6728..0fff858 100755 --- a/src/dcm_svc_ipc.c +++ b/src/dcm_svc_ipc.c @@ -159,7 +159,7 @@ int dcm_ipc_send_client_message(int socket_fd, ms_dcm_msg_type_e msg_type, unsig memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sun_family = AF_UNIX; - strncpy(serv_addr.sun_path, DCM_IPC_PATH[port], sizeof(DCM_IPC_PATH[port])); + DCM_SAFE_STRLCPY(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, DCM_IPC_PATH[port]), sizeof(serv_addr.sun_path)); /* Connecting to the thumbnail server */ if (connect(sock, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) { @@ -240,7 +240,7 @@ int dcm_ipc_send_message(ms_dcm_msg_type_e msg_type, uid_t uid, const char *msg, /* Set dcm thread socket address */ memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sun_family = AF_UNIX; - strncpy(serv_addr.sun_path, DCM_IPC_PATH[port], sizeof(serv_addr.sun_path) - 1); + DCM_SAFE_STRLCPY(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, DCM_IPC_PATH[port]), sizeof(serv_addr.sun_path)); /* Connect to the socket */ if (connect(socket_fd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) { @@ -302,7 +302,7 @@ int dcm_ipc_send_complete(ms_dcm_msg_type_e msg_type, const unsigned int count, /* Set dcm thread socket address */ memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sun_family = AF_UNIX; - strncpy(serv_addr.sun_path, DCM_IPC_PATH[port], sizeof(serv_addr.sun_path) - 1); + DCM_SAFE_STRLCPY(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, DCM_IPC_PATH[port]), sizeof(serv_addr.sun_path)); /* Connect to the socket */ if (connect(socket_fd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) { -- 2.34.1