Skip to content

W
wine-winehq
Commit f0dde6b6 authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

wininet: Simplify GetAddress when using getaddrinfo.

parent 44bf0257
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
dlls/wininet/utility.c
View file @ f0dde6b6
...@@ -187,17 +187,21 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, ...@@ -187,17 +187,21 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort,
TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret));
return FALSE; return FALSE;
} }
if (*sa_len < sizeof(struct sockaddr_in)) if (*sa_len < res->ai_addrlen)
{ {
WARN("address too small\n"); WARN("address too small\n");
freeaddrinfo( res ); freeaddrinfo( res );
return FALSE; return FALSE;
} }
*sa_len = sizeof(struct sockaddr_in); *sa_len = res->ai_addrlen;
memset( psa, 0, sizeof(struct sockaddr_in) ); memcpy( psa, res->ai_addr, res->ai_addrlen );
memcpy( &((struct sockaddr_in *)psa)->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); /* Copy port */
((struct sockaddr_in *)psa)->sin_family = res->ai_family; switch (res->ai_family)
((struct sockaddr_in *)psa)->sin_port = htons(nServerPort); {
case AF_INET:
((struct sockaddr_in *)psa)->sin_port = htons(nServerPort);
break;
}
freeaddrinfo( res ); freeaddrinfo( res );
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment