diff options
author | Haejeong Kim <backto.kim@samsung.com> | 2017-04-13 18:35:15 +0900 |
---|---|---|
committer | Haejeong Kim <backto.kim@samsung.com> | 2017-04-13 18:35:15 +0900 |
commit | 3a8c9ceded482a3df2056bfb98cef172deff16d3 (patch) | |
tree | b279b0826744852c08c471bd0d435c02bbaf2481 /src/ipc/media-thumb-ipc.c | |
parent | f238209b9c81de1606cc43ea4c4e31465a73aaa3 (diff) | |
download | libmedia-thumbnail-3a8c9ceded482a3df2056bfb98cef172deff16d3.tar.gz libmedia-thumbnail-3a8c9ceded482a3df2056bfb98cef172deff16d3.tar.bz2 libmedia-thumbnail-3a8c9ceded482a3df2056bfb98cef172deff16d3.zip |
Change strncpy to g_strlcpysubmit/tizen/20170414.042242accepted/tizen/unified/20170417.082853
Change-Id: I1ad4f3628e6c96a78e2523ab8646adbd8ea48e9c
Diffstat (limited to 'src/ipc/media-thumb-ipc.c')
-rwxr-xr-x | src/ipc/media-thumb-ipc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ipc/media-thumb-ipc.c b/src/ipc/media-thumb-ipc.c index 693a3fa..3238092 100755 --- a/src/ipc/media-thumb-ipc.c +++ b/src/ipc/media-thumb-ipc.c @@ -438,8 +438,8 @@ _media_thumb_recv_msg(int sock, int header_size, thumbMsg *msg) remain_size -= block_size; } - strncpy(msg->org_path, (char *)buf, msg->origin_path_size); - strncpy(msg->dst_path, (char *)buf + msg->origin_path_size, msg->dest_path_size); + SAFE_STRLCPY(msg->org_path, (char *)buf, sizeof(msg->org_path)); + SAFE_STRLCPY(msg->dst_path, (char *)buf + msg->origin_path_size, sizeof(msg->dst_path)); SAFE_FREE(msg->thumb_data); if (msg->thumb_size > 0) { @@ -487,7 +487,7 @@ _media_thumb_recv_udp_msg(int sock, int header_size, thumbMsg *msg, struct socka return MS_MEDIA_ERR_INVALID_PARAMETER; } - strncpy(msg->org_path, (char*)buf + header_size, msg->origin_path_size); + SAFE_STRLCPY(msg->org_path, (char*)buf + header_size, sizeof(msg->org_path)); if (msg->dest_path_size <= 0 || msg->dest_path_size > MAX_PATH_SIZE) { SAFE_FREE(buf); @@ -495,7 +495,7 @@ _media_thumb_recv_udp_msg(int sock, int header_size, thumbMsg *msg, struct socka return MS_MEDIA_ERR_INVALID_PARAMETER; } - strncpy(msg->dst_path, (char*)buf + header_size + msg->origin_path_size, msg->dest_path_size); + SAFE_STRLCPY(msg->dst_path, (char*)buf + header_size + msg->origin_path_size, sizeof(msg->dst_path)); SAFE_FREE(buf); *from_size = from_addr_size; @@ -560,7 +560,7 @@ _media_thumb_request(int msg_type, const char *origin_path, char *thumb_path, in memset(&serv_addr, 0, sizeof(serv_addr)); sock = sock_info.sock_fd; serv_addr.sun_family = AF_UNIX; - strncpy(serv_addr.sun_path, THUMB_IPC_PATH, strlen(THUMB_IPC_PATH)); + SAFE_STRLCPY(serv_addr.sun_path, THUMB_IPC_PATH, sizeof(serv_addr.sun_path)); /* Connecting to the thumbnail server */ if (connect(sock, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) { @@ -582,7 +582,7 @@ _media_thumb_request(int msg_type, const char *origin_path, char *thumb_path, in /* Set requset message */ req_msg.msg_type = msg_type; req_msg.uid = uid; - strncpy(req_msg.org_path, origin_path, sizeof(req_msg.org_path)); + SAFE_STRLCPY(req_msg.org_path, origin_path, sizeof(req_msg.org_path)); req_msg.org_path[strlen(req_msg.org_path)] = '\0'; req_msg.origin_path_size = strlen(req_msg.org_path) + 1; @@ -771,7 +771,7 @@ int _media_thumb_send_request() memset(&serv_addr, 0, sizeof(serv_addr)); sock = sock_info.sock_fd; serv_addr.sun_family = AF_UNIX; - strncpy(serv_addr.sun_path, THUMB_IPC_PATH, strlen(THUMB_IPC_PATH)); + SAFE_STRLCPY(serv_addr.sun_path, THUMB_IPC_PATH, sizeof(serv_addr.sun_path)); GIOChannel *channel = NULL; channel = g_io_channel_unix_new(sock); @@ -816,7 +816,7 @@ int _media_thumb_send_request() req_msg.msg_type = req_manager->msg_type; req_msg.request_id = 0; req_msg.uid = req_manager->uid; - strncpy(req_msg.org_path, req_manager->path, sizeof(req_msg.org_path)); + SAFE_STRLCPY(req_msg.org_path, req_manager->path, sizeof(req_msg.org_path)); req_msg.org_path[strlen(req_msg.org_path)] = '\0'; req_msg.dst_path[0] = '\0'; req_msg.origin_path_size = strlen(req_msg.org_path) + 1; @@ -891,7 +891,7 @@ int _media_thumb_raw_data_send_request() memset(&serv_addr, 0, sizeof(serv_addr)); sock = sock_info.sock_fd; serv_addr.sun_family = AF_UNIX; - strncpy(serv_addr.sun_path, THUMB_IPC_PATH, strlen(THUMB_IPC_PATH)); + SAFE_STRLCPY(serv_addr.sun_path, THUMB_IPC_PATH, sizeof(serv_addr.sun_path)); GIOChannel *channel = NULL; channel = g_io_channel_unix_new(sock); @@ -937,7 +937,7 @@ int _media_thumb_raw_data_send_request() req_msg.thumb_height = req_manager->height; req_msg.uid = req_manager->uid; - strncpy(req_msg.org_path, req_manager->path, sizeof(req_msg.org_path)); + SAFE_STRLCPY(req_msg.org_path, req_manager->path, sizeof(req_msg.org_path)); req_msg.org_path[strlen(req_msg.org_path)] = '\0'; req_msg.dst_path[0] = '\0'; |