From: Jiyong Min Date: Wed, 28 Jun 2017 06:26:55 +0000 (+0900) Subject: Use tzplatform_mkpath to make system-path & replace strcpy to g_strcpy to be safety X-Git-Tag: submit/tizen/20170705.070223~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d885d41d3891d96d614e31ede52d6f79dfb4fe7d;p=platform%2Fcore%2Fmultimedia%2Fdcm-service.git Use tzplatform_mkpath to make system-path & replace strcpy to g_strcpy to be safety Change-Id: I400c6568ff24dd5e712575be9889c5747fbeaed5 Signed-off-by: Jiyong Min --- diff --git a/include/dcm_svc_debug.h b/include/dcm_svc_debug.h index a6118d0..1a5e95e 100755 --- a/include/dcm_svc_debug.h +++ b/include/dcm_svc_debug.h @@ -98,6 +98,7 @@ #define DCM_CHECK(expr) dcm_retm_if(!(expr), "Invalid parameter, return!") #define DCM_SAFE_FREE(ptr) { if (ptr) {free(ptr); ptr = NULL; } } +#define DCM_SAFE_STRLCPY(dst, src, n) g_strlcpy(dst, src, n); #endif /* _DCM_DEBUG_UTILS_H_ */ diff --git a/packaging/dcm-service.spec b/packaging/dcm-service.spec index 45d377b..284e986 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.1 +Version: 0.1.2 Release: 0 Group: Multimedia/Service License: Apache-2.0 diff --git a/src/dcm_svc_ipc.c b/src/dcm_svc_ipc.c index efd4151..7ee6728 100755 --- a/src/dcm_svc_ipc.c +++ b/src/dcm_svc_ipc.c @@ -28,11 +28,12 @@ #include #include +#include static char DCM_IPC_PATH[][100] = { - {"/var/run/media-server/dcm_ipc_scanthread.socket"}, - {"/var/run/media-server/media_ipc_dcmdaemon.socket"}, - {"/var/run/media-server/media_ipc_dcmcomm.socket"}, + {"media-server/dcm_ipc_scanthread.socket"}, + {"media-server/media_ipc_dcmdaemon.socket"}, + {"media-server/media_ipc_dcmcomm.socket"}, }; int dcm_ipc_receive_message(int client_sock, dcmMsg *recv_msg) @@ -93,8 +94,8 @@ int dcm_ipc_create_socket(int *socket_fd, dcm_ipc_port_e port) /* Set socket address */ memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sun_family = AF_UNIX; - unlink(DCM_IPC_PATH[port]); - strncpy(serv_addr.sun_path, DCM_IPC_PATH[port], sizeof(serv_addr.sun_path) - 1); + unlink(tzplatform_mkpath(TZ_SYS_RUN, 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)); /* Bind socket to local address */ for (i = 0; i < 100; i++) { @@ -122,7 +123,7 @@ int dcm_ipc_create_socket(int *socket_fd, dcm_ipc_port_e port) dcm_debug("Listening..."); /* change permission of local socket file */ - if (chmod(DCM_IPC_PATH[port], 0777) < 0) + if (chmod(tzplatform_mkpath(TZ_SYS_RUN, DCM_IPC_PATH[port]), 0777) < 0) dcm_stderror("chmod failed"); *socket_fd = sock;