From 59521087f7c80c40525b17431f2988a815a842a0 Mon Sep 17 00:00:00 2001 From: Maximilien Siavelis <m@siav.pw> Date: 周一, 06 5月 2019 00:51:57 +0800 Subject: [PATCH] Merge pull request #20 from willamowius/master --- src/library/os/network_id.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/library/os/network_id.c b/src/library/os/network_id.c index 1c112b2..f50dc64 100644 --- a/src/library/os/network_id.c +++ b/src/library/os/network_id.c @@ -58,7 +58,7 @@ FUNCTION_RETURN f_return = FUNC_RET_OK; struct ifaddrs *ifaddr, *ifa; - int family, i, n, if_name_position; + int family, n = 0, if_name_position; unsigned int if_num, if_max; //char host[NI_MAXHOST]; char *ifnames; @@ -96,7 +96,7 @@ strncpy(&ifnames[if_num * NI_MAXHOST], ifa->ifa_name, NI_MAXHOST); if (adapterInfos != NULL && if_num < *adapter_info_size) { strncpy(adapterInfos[if_num].description, ifa->ifa_name, - NI_MAXHOST); + NI_MAXHOST-1); } if_name_position = if_num; if_num++; @@ -148,7 +148,7 @@ } else if (family == AF_PACKET && ifa->ifa_data != NULL) { struct sockaddr_ll *s1 = (struct sockaddr_ll*) ifa->ifa_addr; if (adapterInfos != NULL && if_name_position < *adapter_info_size) { - for (i = 0; i < 6; i++) { + for (int i = 0; i < 6; i++) { adapterInfos[if_name_position].mac_address[i] = s1->sll_addr[i]; #ifdef _DEBUG -- Gitblit v1.9.1