 @@ -1,14 +1,14 @@
-/*	$NetBSD: net.c,v 1.30 2019/06/22 20:46:07 christos Exp $	*/
+/*	$NetBSD: net.c,v 1.31 2019/07/07 12:58:45 martin Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -231,28 +231,28 @@ get_ifconfig_info(struct net_desc *devs)
 	int i;
 	/* Get ifconfig information */
 	textsize = collect(T_OUTPUT, &buf_in, "/sbin/ifconfig -l 2>/dev/null");
 	if (textsize < 0) {
 		if (logfp)
 			(void)fprintf(logfp,
 			    "Aborting: Could not run ifconfig.\n");
 		(void)fprintf(stderr, "Could not run ifconfig.");
 		exit(1);
+	}
 	buf = malloc (STRSIZE * sizeof(char));
-	for (i = 0, buf_tmp = buf_in; strlen(buf_tmp) > 0 && buf_tmp < buf_in +
+	for (i = 0, buf_tmp = buf_in; i < MAX_NETS && strlen(buf_tmp) > 0
-	     strlen(buf_in);) {
+	    && buf_tmp < buf_in + strlen(buf_in);) {
 		tmp = stpncpy(buf, buf_tmp, strcspn(buf_tmp," \n"));
 		*tmp='\0';
 		buf_tmp += (strcspn(buf_tmp, " \n") + 1) * sizeof(char);
 		/* Skip ignored interfaces */
 		for (ignore = ignored_if_names; *ignore != NULL; ignore++) {
 			size_t len = strlen(*ignore);
 			if (strncmp(buf, *ignore, len) == 0 &&
 			    isdigit((unsigned char)buf[len]))
 				break;
+		}
 		if (*ignore != NULL)
 			continue;
 @@ -475,66 +475,75 @@ handle_license(const char *dev)
 int
 config_network(void)
+{
 	char *textbuf;
 	int  octet0;
 	int  dhcp_config;
 	int  nfs_root = 0;
  	int  slip = 0;
  	int  pid, status;
  	char **ap, *slcmd[10], *in_buf;
  	char buffer[STRSIZE];
  	struct statvfs sb;
 	struct net_desc net_devs[MAX_NETS];
-	menu_ent net_menu[5];
+	menu_ent *net_menu;
 	int menu_no;
 	int num_devs;
 	int selected_net;
 	int i;
 #ifdef INET6
 	int v6config = 1, rv;
 #endif
 	FILE *f;
 	time_t now;
 	if (network_up)
 		return (1);
 	num_devs = get_ifconfig_info(net_devs);
 	if (num_devs < 1) {
 		/* No network interfaces found! */
 		hit_enter_to_continue(NULL, MSG_nonet);
-		return (-1);
+		return -1;
+	}
 	net_menu = calloc(num_devs, sizeof(*net_menu));
 	if (net_menu == NULL) {
 		err_msg_win(err_outofmem);
 		return -1;
+	}
 	for (i = 0; i < num_devs; i++) {
 		net_menu[i].opt_name = net_devs[i].if_dev;
 		net_menu[i].opt_flags = OPT_EXIT;
 		net_menu[i].opt_action = set_menu_select;
+	}
 again:
 	selected_net = -1;
 	menu_no = new_menu(MSG_netdevs,
 		net_menu, num_devs, -1, 4, 0, 0,
 		MC_SCROLL,
 		NULL, NULL, NULL, NULL, NULL);
 again:
 	selected_net = -1;
 	msg_display(MSG_asknetdev);
 	process_menu(menu_no, &selected_net);
 	free_menu(menu_no);
 	if (selected_net == -1) {
-	if (selected_net == -1)
+		free_menu(menu_no);
-	    return 0;
+		free(net_menu);
 		return 0;
+	}
 	network_up = 1;
 	dhcp_config = 0;
 	strncpy(net_dev, net_devs[selected_net].if_dev, STRSIZE);
 	if (!handle_license(net_dev))
 		goto done;
 	slip = net_dev[0] == 's' && net_dev[1] == 'l' &&
 	    isdigit((unsigned char)net_dev[2]);
 	/* If root is on NFS do not reconfigure the interface. */
 @@ -741,26 +750,29 @@ again:
 		    net_dev,
 		    *net_media == '\0' ? "<default>" : net_media,
 		    *net_ip == '\0' ? "<none>" : net_ip,
 		    *net_mask == '\0' ? "<none>" : net_mask,
 		    *net_defroute == '\0' ? "<none>" : net_defroute);
 #ifdef INET6
 	msg_fmt_display_add(MSG_netokv6, "%s",
 		     !is_v6kernel() ? "<not supported>" : net_ip6);
 #endif
 done:
 	if (!ask_yesno(MSG_netok_ok))
 		goto again;
 	free_menu(menu_no);
 	free(net_menu);
 	run_program(0, "/sbin/ifconfig lo0 127.0.0.1");
 	/* dhcpcd will have configured it all for us */
 	if (dhcp_config) {
 		fflush(NULL);
 		network_up = 1;
 		return network_up;
+	}
 	/*
 	 * we may want to perform checks against inconsistent configuration,
 	 * like IPv4 DNS server without IPv4 configuration.
 	 */