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

Win32: Wine: Oversize buffer for WSAIoctl/SIO_GET_INTERFACE_LIST

Browse Source 
This is a workaround for https://bugs.winehq.org/show_bug.cgi?id=49371

See also: 1e7a73b2
This commit is contained in:
Jonathan G Rennison
2020-06-12 17:15:03 +01:00
parent 3eb8d62148
commit 663886843c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,9 +109,13 @@ static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // Wi
SOCKET sock = socket(AF_INET, SOCK_DGRAM, 0); SOCKET sock = socket(AF_INET, SOCK_DGRAM, 0);
if (sock == INVALID_SOCKET) return; if (sock == INVALID_SOCKET) return;
// Workaround for incorrect buffer size length check in WINE
// See: https://bugs.winehq.org/show_bug.cgi?id=49371
const int BUFFER_OVERSIZE_FACTOR = 10;
DWORD len = 0; DWORD len = 0;
int num = 8; int num = 8;
INTERFACE_INFO *ifo = CallocT<INTERFACE_INFO>(num); INTERFACE_INFO *ifo = CallocT<INTERFACE_INFO>(num * BUFFER_OVERSIZE_FACTOR);
for (;;) { for (;;) {
if (WSAIoctl(sock, SIO_GET_INTERFACE_LIST, nullptr, 0, ifo, num * sizeof(*ifo), &len, nullptr, nullptr) == 0) break; if (WSAIoctl(sock, SIO_GET_INTERFACE_LIST, nullptr, 0, ifo, num * sizeof(*ifo), &len, nullptr, nullptr) == 0) break;
@@ -121,9 +125,9 @@ static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // Wi
return; return;
} }
num *= 2; num *= 2;
ifo = CallocT<INTERFACE_INFO>(num); ifo = CallocT<INTERFACE_INFO>(num * BUFFER_OVERSIZE_FACTOR);
} }
assert(len <= num * sizeof(*ifo)); assert(len <= num * sizeof(*ifo) * BUFFER_OVERSIZE_FACTOR);
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;