Bruno Jesus : ws2_32: Fix edge case for getaddrinfo in BSD and OSX.
Alexandre Julliard
julliard at winehq.org
Mon Feb 17 13:45:14 CST 2014
Module: wine
Branch: master
Commit: da16d6b66003f05e39c92897bb973f4b79fce7e3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=da16d6b66003f05e39c92897bb973f4b79fce7e3
Author: Bruno Jesus <00cpxxx at gmail.com>
Date: Fri Feb 14 08:44:21 2014 -0200
ws2_32: Fix edge case for getaddrinfo in BSD and OSX.
---
dlls/ws2_32/socket.c | 3 +++
dlls/ws2_32/tests/sock.c | 24 ++++++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 7a9440f..a9ac79d 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -5466,6 +5466,9 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr
else
node = nodename;
+ /* servname tweak required by OSX and BSD kernels */
+ if (servname && !servname[0]) servname = "0";
+
if (hints) {
punixhints = &unixhints;
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index cb67533..e146548 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -5402,12 +5402,24 @@ static void test_GetAddrInfoW(void)
pFreeAddrInfoW(result);
result = NULL;
+ ret = pGetAddrInfoW(NULL, empty, NULL, &result);
+ ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError());
+ ok(result != NULL, "GetAddrInfoW failed\n");
+ pFreeAddrInfoW(result);
+
+ result = NULL;
ret = pGetAddrInfoW(empty, zero, NULL, &result);
ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError());
ok(result != NULL, "GetAddrInfoW failed\n");
pFreeAddrInfoW(result);
result = NULL;
+ ret = pGetAddrInfoW(empty, empty, NULL, &result);
+ ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError());
+ ok(result != NULL, "GetAddrInfoW failed\n");
+ pFreeAddrInfoW(result);
+
+ result = NULL;
ret = pGetAddrInfoW(localhost, NULL, NULL, &result);
ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError());
pFreeAddrInfoW(result);
@@ -5529,12 +5541,24 @@ static void test_getaddrinfo(void)
pfreeaddrinfo(result);
result = NULL;
+ ret = pgetaddrinfo(NULL, "", NULL, &result);
+ ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError());
+ ok(result != NULL, "getaddrinfo failed\n");
+ pfreeaddrinfo(result);
+
+ result = NULL;
ret = pgetaddrinfo("", "0", NULL, &result);
ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError());
ok(result != NULL, "getaddrinfo failed\n");
pfreeaddrinfo(result);
result = NULL;
+ ret = pgetaddrinfo("", "", NULL, &result);
+ ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError());
+ ok(result != NULL, "getaddrinfo failed\n");
+ pfreeaddrinfo(result);
+
+ result = NULL;
ret = pgetaddrinfo("localhost", NULL, NULL, &result);
ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError());
pfreeaddrinfo(result);
More information about the wine-cvs
mailing list