From 0ec4d68600b83d41d2e48ad35d18e2a00f234619 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 21 9月 2019 01:34:22 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager into develop
---
src/library/os/network_id.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/library/os/network_id.c b/src/library/os/network_id.c
index 5a671f0..556ef49 100644
--- a/src/library/os/network_id.c
+++ b/src/library/os/network_id.c
@@ -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,8 @@
} 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 (int i = 0; i < 6; i++) {
+ int i;
+ for (i = 0; i < 6; i++) {
adapterInfos[if_name_position].mac_address[i] =
s1->sll_addr[i];
#ifdef _DEBUG
--
Gitblit v1.9.1