From 663886843c81c2cc3f95cdaacd591520dca5f01d Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Fri, 12 Jun 2020 17:15:03 +0100 Subject: [PATCH] Win32: Wine: Oversize buffer for WSAIoctl/SIO_GET_INTERFACE_LIST This is a workaround for https://bugs.winehq.org/show_bug.cgi?id=49371 See also: 1e7a73b2 --- src/network/core/host.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/network/core/host.cpp b/src/network/core/host.cpp index c42bd70428..8eecea9b9b 100644 --- a/src/network/core/host.cpp +++ b/src/network/core/host.cpp @@ -109,9 +109,13 @@ static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // Wi SOCKET sock = socket(AF_INET, SOCK_DGRAM, 0); 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; int num = 8; - INTERFACE_INFO *ifo = CallocT(num); + INTERFACE_INFO *ifo = CallocT(num * BUFFER_OVERSIZE_FACTOR); for (;;) { 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; } num *= 2; - ifo = CallocT(num); + ifo = CallocT(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++) { if (ifo[j].iiFlags & IFF_LOOPBACK) continue;