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

ws2_32: Filter unset bits when argument is smaller than 32 bits.

Browse Source
This commit is contained in:
Bruno Jesus 2014-12-05 02:26:34 -02:00 committed by Alexandre Julliard
parent 14324fec97
commit d7a8beb0f7
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/ws2_32/socket.c
View File

@ -5013,6 +5013,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
{ {
woptval= *((const INT16 *) optval); woptval= *((const INT16 *) optval);
optval= (char*) &woptval; optval= (char*) &woptval;
woptval&= (1 << optlen * 8) - 1;
optlen=sizeof(int); optlen=sizeof(int);
} }
fd = get_sock_fd( s, 0, NULL ); fd = get_sock_fd( s, 0, NULL );

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

@ -1374,6 +1374,23 @@ todo_wine
closesocket(s); closesocket(s);
/* Test WS_IP_MULTICAST_TTL with 8, 16, 24 and 32 bits values */
s = socket(AF_INET, SOCK_DGRAM, 0);
ok(s != INVALID_SOCKET, "Failed to create socket\n");
size = sizeof(i);
for (i = 0; i < 4; i++)
{
int k, j;
const int tests[] = {0xffffff0a, 0xffff000b, 0xff00000c, 0x0000000d};
err = setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &tests[i], i + 1);
ok(!err, "Test [%d] Expected 0, got %d\n", i, err);
err = getsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &k, &size);
ok(!err, "Test [%d] Expected 0, got %d\n", i, err);
j = i != 3 ? tests[i] & ((1 << (i + 1) * 8) - 1) : tests[i];
ok(k == j, "Test [%d] Expected 0x%x, got 0x%x\n", i, j, k);
}
closesocket(s);
/* test SO_PROTOCOL_INFOA invalid parameters */ /* test SO_PROTOCOL_INFOA invalid parameters */
ok(getsockopt(INVALID_SOCKET, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, NULL), ok(getsockopt(INVALID_SOCKET, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, NULL),
"getsockopt should have failed\n"); "getsockopt should have failed\n");