From 46ce813e330925e0ab5969cf3e34c9e49fb9df88 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 10 Mar 2016 19:22:04 +0000 Subject: [PATCH] setup: Fix segmentation fault with more than four NICs found Signed-off-by: Michael Tremer --- src/setup/netstuff.c | 8 ++++---- src/setup/setup.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/setup/netstuff.c b/src/setup/netstuff.c index f5b3849893..240306e971 100644 --- a/src/setup/netstuff.c +++ b/src/setup/netstuff.c @@ -601,16 +601,16 @@ int scan_network_cards(void) int nicmenu(int colour) { int rc, choise = 0, count = 0, kcount = 0, mcount = 0, i, j, nic_in_use; - int found_NIC_as_Card[4]; + int found_NIC_as_Card[MAX_NICS]; char message[STRING_SIZE]; char temp[STRING_SIZE]; char cMenuInhalt[STRING_SIZE]; - char MenuInhalt[20][180]; - char *pMenuInhalt[20]; + char MenuInhalt[MAX_NICS][STRING_SIZE]; + char *pMenuInhalt[MAX_NICS]; while (strcmp(nics[count].macaddr, "")) count++; // 2 find how many nics in system - for ( i=0 ; i<4;i++) if (strcmp(knics[i].macaddr, "")) kcount++; // loop to find all knowing nics + for (i=0; i kcount) { diff --git a/src/setup/setup.h b/src/setup/setup.h index 14fd64634b..a368b78ae1 100644 --- a/src/setup/setup.h +++ b/src/setup/setup.h @@ -55,6 +55,8 @@ int handletimezone(void); #define _ORANGE_CARD_ 2 #define _BLUE_CARD_ 3 +#define MAX_NICS 20 + struct nic { char driver[80]; -- 2.39.2