From 459f9562fff667d347feda18f319f26eca675e67 Mon Sep 17 00:00:00 2001 From: "chleun.moon" Date: Wed, 2 Aug 2017 10:20:33 +0900 Subject: [PATCH] [WGID-159165] Fixed unreachable code Change-Id: I2f2f0d7cd5ed54860a49438eb24a3e22690c7f11 Signed-off-by: cheoleun --- packaging/net-config.spec | 2 +- src/vpnsvc-internal.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packaging/net-config.spec b/packaging/net-config.spec index fba58f6..c2a30ea 100755 --- a/packaging/net-config.spec +++ b/packaging/net-config.spec @@ -1,6 +1,6 @@ Name: net-config Summary: TIZEN Network Configuration service -Version: 1.1.112 +Version: 1.1.113 Release: 2 Group: System/Network License: Apache-2.0 diff --git a/src/vpnsvc-internal.c b/src/vpnsvc-internal.c index ae8baee..87add01 100755 --- a/src/vpnsvc-internal.c +++ b/src/vpnsvc-internal.c @@ -157,10 +157,8 @@ static char *connman_default_profile(GDBusConnection *connection) if (message) { g_variant_get(message, "(a(oa{sv}))", &iter); - while (g_variant_iter_loop(iter, "(oa{sv})", &key, &value)) { + if (g_variant_iter_loop(iter, "(oa{sv})", &key, &value)) profile = strdup(key); - break; - } if (value) g_variant_iter_free(value); @@ -758,7 +756,6 @@ static int check_interface_precondition(const char *iface_name) int vpn_service_init(const char* iface_name, size_t iface_name_len, int fd, vpnsvc_tun_s *handle_s) { struct ifreq ifr; - size_t len = 0; char buf[BUF_SIZE_FOR_ERR] = { 0 }; DBG("enter vpn_daemon_init, iface_name : %s, iface_name_len : %d, fd : %d\n", iface_name, iface_name_len, fd); @@ -775,6 +772,7 @@ int vpn_service_init(const char* iface_name, size_t iface_name_len, int fd, vpns if (*iface_name) strncpy(ifr.ifr_name, iface_name, iface_name_len); + ifr.ifr_name[iface_name_len] = '\0'; DBG("before init, ifindex : %d", ifr.ifr_ifindex); @@ -798,9 +796,7 @@ int vpn_service_init(const char* iface_name, size_t iface_name_len, int fd, vpns handle_s->fd = 0; /* server fd does not meaning */ handle_s->index = get_interface_index(iface_name); - len = strlen(ifr.ifr_name); - strncpy(handle_s->name, ifr.ifr_name, len); - handle_s->name[len] = '\0'; + g_strlcpy(handle_s->name, ifr.ifr_name, VPNSVC_VPN_IFACE_NAME_LEN); return VPNSVC_ERROR_NONE; } -- 2.7.4