diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4c185d8123617657e09146a9e7713d66c95ccb51..f4111cd42ec85acfd0b8f1cf4fc2b90bc84404d4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2812,6 +2812,13 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, TRACE("socket: %04lx, level 0x%x, name 0x%x, ptr %p, len %d\n", s, level, optname, optval, optlen); + /* some broken apps pass the value directly instead of a pointer to it */ + if(IS_INTRESOURCE(optval)) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + switch(level) { case WS_SOL_SOCKET: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8225f5f9d60056e897967b88faa5b8669c4ae53d..858d0b5c49e5b1c191ef7425b124b3ebc4d2a72b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -850,7 +850,7 @@ LINGER linger_testvals[] = { static void test_set_getsockopt(void) { SOCKET s; - int i, err; + int i, err, lasterr; int timeout; LINGER lingval; int size; @@ -889,6 +889,15 @@ static void test_set_getsockopt(void) lingval.l_onoff, lingval.l_linger, linger_testvals[i].l_onoff, linger_testvals[i].l_linger); } + /* Test for erroneously passing a value instead of a pointer as optval */ + size = sizeof(char); + err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size); + ok(err == SOCKET_ERROR, "setsockopt with optval being a value passed " + "instead of failing.\n"); + lasterr = WSAGetLastError(); + ok(lasterr == WSAEFAULT, "setsockopt with optval being a value " + "returned 0x%08x, not WSAEFAULT(0x%08x)\n", + lasterr, WSAEFAULT); closesocket(s); }