Commit bde4e362 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

ws2_32: Handle NULL argument in inet_addr.

parent cdca32c1
......@@ -2175,6 +2175,7 @@ int WINAPI WSAHtons(SOCKET s, WS_u_short hostshort, WS_u_short *lpnetshort)
*/
WS_u_long WINAPI WS_inet_addr(const char *cp)
{
if (!cp) return INADDR_NONE;
return inet_addr(cp);
}
......
......@@ -1491,7 +1491,7 @@ done:
closesocket(server_socket);
}
static void test_extendedSocketOptions()
static void test_extendedSocketOptions(void)
{
WSADATA wsa;
SOCKET sock;
......@@ -1565,7 +1565,7 @@ static void test_extendedSocketOptions()
WSACleanup();
}
static void test_getsockname()
static void test_getsockname(void)
{
WSADATA wsa;
SOCKET sock;
......@@ -1612,6 +1612,14 @@ static void test_getsockname()
WSACleanup();
}
static void test_inet_addr(void)
{
u_long addr;
addr = inet_addr(NULL);
ok(addr == INADDR_NONE, "inet_addr succeeded unexpectedly\n");
}
/**************** Main program ***************/
START_TEST( sock )
......@@ -1643,6 +1651,7 @@ START_TEST( sock )
test_select();
test_accept();
test_getsockname();
test_inet_addr();
Exit();
}
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