ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ws2_32: Accept shouldn't fail when addrlen32 is NULL. 

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alistair Leslie-Hughes 2016-09-07 04:31:42 +00:00 committed by Alexandre Julliard
parent 18420826aa
commit f9d4057574
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ws2_32/socket.c
View File

@ -2653,7 +2653,7 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32)
SERVER_END_REQ;
if (!status)
{
if (addr && WS_getpeername(as, addr, addrlen32))
if (addr && addrlen32 && WS_getpeername(as, addr, addrlen32))
{
WS_closesocket(as);
return SOCKET_ERROR;

15
dlls/ws2_32/tests/sock.c
View File

@ -4068,7 +4068,7 @@ static void test_accept(void)
int ret;
SOCKET server_socket, accepted = INVALID_SOCKET, connector;
struct sockaddr_in address;
SOCKADDR_STORAGE ss;
SOCKADDR_STORAGE ss, ss_empty;
int socklen;
select_thread_params thread_params;
HANDLE thread_handle = NULL;
@ -4199,6 +4199,19 @@ static void test_accept(void)
ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError());
ok(socklen != sizeof(ss), "unexpected length\n");
ok(ss.ss_family, "family not set\n");
closesocket(accepted);
closesocket(connector);
accepted = connector = INVALID_SOCKET;
socklen = sizeof(address);
connector = setup_connector_socket(&address, socklen, FALSE);
if (connector == INVALID_SOCKET) goto done;
memset(&ss, 0, sizeof(ss));
memset(&ss_empty, 0, sizeof(ss_empty));
accepted = accept(server_socket, (struct sockaddr *)&ss, NULL);
ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError());
ok(!memcmp(&ss, &ss_empty, sizeof(ss)), "structure is different\n");
done:
if (accepted != INVALID_SOCKET)