(svn r12017) -Fix: when you have more than 9 network interfaces you'll enter the wonderfull world of overflows.
authorrubidium
Tue, 29 Jan 2008 21:43:22 +0000
changeset 8943 9706d328bb12
parent 8942 7cf2427744ba
child 8944 8cd013359596
(svn r12017) -Fix: when you have more than 9 network interfaces you'll enter the wonderfull world of overflows.
src/network/network.cpp
--- a/src/network/network.cpp	Tue Jan 29 19:23:31 2008 +0000
+++ b/src/network/network.cpp	Tue Jan 29 21:43:22 2008 +0000
@@ -404,6 +404,7 @@
 				inaddr.s_addr = htonl(ip | ~netmask);
 				_broadcast_list[i] = inaddr.s_addr;
 				i++;
+				if (i == MAX_INTERFACES) break;
 			}
 			if (read < 0) {
 				break;
@@ -431,6 +432,7 @@
 		if (ifa->ifa_broadaddr->sa_family != AF_INET) continue;
 		_broadcast_list[i] = ((struct sockaddr_in*)ifa->ifa_broadaddr)->sin_addr.s_addr;
 		i++;
+		if (i == MAX_INTERFACES) break;
 	}
 	freeifaddrs(ifap);
 
@@ -470,6 +472,7 @@
 		_broadcast_list[i++] =
 			 ifo[j].iiAddress.AddressIn.sin_addr.s_addr |
 			~ifo[j].iiNetmask.AddressIn.sin_addr.s_addr;
+		if (i == MAX_INTERFACES) break;
 	}
 #else
 	ifconf.ifc_len = sizeof(buf);
@@ -493,6 +496,7 @@
 					ioctl(sock, SIOCGIFBRDADDR, &r) != -1) {
 				_broadcast_list[i++] =
 					((struct sockaddr_in*)&r.ifr_broadaddr)->sin_addr.s_addr;
+				if (i == MAX_INTERFACES) break;
 			}
 		}