dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Win32: Check for buffer overrun when calling WSAIoctl/SIO_GET_INTERFACE_LIST

Browse Source 
This has been observed on Wine
This commit is contained in:
Jonathan G Rennison
2020-04-11 00:57:46 +01:00
parent efaeb9e182
commit 1e7a73b2c7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/core/host.cpp
View File

@@ -110,7 +110,7 @@ static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // Wi
if (sock == INVALID_SOCKET) return; if (sock == INVALID_SOCKET) return;
DWORD len = 0; DWORD len = 0;
int num = 2; int num = 8;
INTERFACE_INFO *ifo = CallocT<INTERFACE_INFO>(num); INTERFACE_INFO *ifo = CallocT<INTERFACE_INFO>(num);
for (;;) { for (;;) {
@@ -123,6 +123,7 @@ static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // Wi
num *= 2; num *= 2;
ifo = CallocT<INTERFACE_INFO>(num); ifo = CallocT<INTERFACE_INFO>(num);
} }
assert(len <= num * sizeof(*ifo));
for (uint j = 0; j < len / sizeof(*ifo); j++) { for (uint j = 0; j < len / sizeof(*ifo); j++) {
if (ifo[j].iiFlags & IFF_LOOPBACK) continue; if (ifo[j].iiFlags & IFF_LOOPBACK) continue;