marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ws2_32: Use heap_realloc instead of HeapReAlloc to avoid an invalid realloc (Valgrind). 

Signed-off-by: Sven Baars <sven.wine@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 651c446217)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
oldstable
Sven Baars 2019-02-06 19:44:06 +01:00 committed by Michael Stefaniuc
parent 2eac88925a
commit 93a396f4de
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/ws2_32/socket.c
View File

@ -158,6 +158,7 @@
#include "wine/debug.h"
#include "wine/exception.h"
#include "wine/unicode.h"
#include "wine/heap.h"
#if defined(linux) && !defined(IP_UNICAST_IF)
#define IP_UNICAST_IF 50
@ -6272,8 +6273,7 @@ static struct WS_hostent* WS_get_local_ips( char *hostname )
return NULL;
adapters = HeapAlloc(GetProcessHeap(), 0, adap_size);
routes = HeapAlloc(GetProcessHeap(), 0, route_size);
route_addrs = HeapAlloc(GetProcessHeap(), 0, 0); /* HeapReAlloc doesn't work on NULL */
if (adapters == NULL || routes == NULL || route_addrs == NULL)
if (adapters == NULL || routes == NULL)
goto cleanup;
/* Obtain the adapter list and the full routing table */
if (GetAdaptersInfo(adapters, &adap_size) != NO_ERROR)
@ -6306,7 +6306,7 @@ static struct WS_hostent* WS_get_local_ips( char *hostname )
}
if (exists)
continue;
route_addrs = HeapReAlloc(GetProcessHeap(), 0, route_addrs, (numroutes+1)*sizeof(struct route));
route_addrs = heap_realloc(route_addrs, (numroutes+1)*sizeof(struct route));
if (route_addrs == NULL)
goto cleanup; /* Memory allocation error, fail gracefully */
route_addrs[numroutes].interface = ifindex;