Fix that socket binding was not connected by wrong address 54/137254/2
authorJiyong Min <jiyong.min@samsung.com>
Wed, 5 Jul 2017 06:10:07 +0000 (15:10 +0900)
committerJiyong Min <jiyong.min@samsung.com>
Wed, 5 Jul 2017 06:12:38 +0000 (15:12 +0900)
Change-Id: Iaa2df51a27c8fd3d083dfa61186723385ee8f1ba
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>
packaging/dcm-service.spec
src/dcm_svc_ipc.c

index 284e9861fb812254ae073d1264b9fed662a6ced1..596aa1adba09a181f9317dba75efe08f6cbece11 100755 (executable)
@@ -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
index 7ee6728240db7b50eb66375cf68c7be3bbbd1739..0fff858aaf4cf87b0d5757a028427f275016b98c 100755 (executable)
@@ -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) {