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

ws2_32: Avoid an unhandled exception in WSAIoctl.

This commit is contained in:
Bruno Jesus 2011-09-05 23:04:23 -03:00 committed by Alexandre Julliard
parent 6deccab6c9
commit 312f50a26f
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/ws2_32/socket.c
View File

@ -3365,17 +3365,20 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
} }
case WS_SIO_KEEPALIVE_VALS: case WS_SIO_KEEPALIVE_VALS:
{ {
struct tcp_keepalive *k = in_buff; struct tcp_keepalive *k;
int keepalive = k->onoff ? 1 : 0; int keepalive, keepidle, keepintvl;
int keepidle = k->keepalivetime / 1000;
int keepintvl = k->keepaliveinterval / 1000;
if (!in_buff) if (!in_buff || in_size < sizeof(struct tcp_keepalive))
{ {
WSASetLastError(WSAEINVAL); WSASetLastError(WSAEFAULT);
return SOCKET_ERROR; return SOCKET_ERROR;
} }
k = in_buff;
keepalive = k->onoff ? 1 : 0;
keepidle = k->keepalivetime / 1000;
keepintvl = k->keepaliveinterval / 1000;
TRACE("onoff: %d, keepalivetime: %d, keepaliveinterval: %d\n", keepalive, keepidle, keepintvl); TRACE("onoff: %d, keepalivetime: %d, keepaliveinterval: %d\n", keepalive, keepidle, keepintvl);
fd = get_sock_fd(s, 0, NULL); fd = get_sock_fd(s, 0, NULL);

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

@ -26,6 +26,7 @@
#include <windows.h> #include <windows.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <mswsock.h> #include <mswsock.h>
#include <mstcpip.h>
#include <stdio.h> #include <stdio.h>
#include "wine/test.h" #include "wine/test.h"
@ -2960,6 +2961,18 @@ static void test_ioctlsocket(void)
ret = ioctlsocket(sock, SIOCATMARK, &arg); ret = ioctlsocket(sock, SIOCATMARK, &arg);
if(ret != SOCKET_ERROR) if(ret != SOCKET_ERROR)
todo_wine ok(arg, "expected a non-zero value\n"); todo_wine ok(arg, "expected a non-zero value\n");
ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &arg, 0, NULL, 0, &arg, NULL, NULL);
ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n");
ret = WSAGetLastError();
ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret);
ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, NULL, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL);
ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n");
ret = WSAGetLastError();
ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret);
closesocket(sock);
} }
static int drain_pause=0; static int drain_pause=0;