Paul Gofman : ws2_32: Manage shorter length for TCP_NODELAY.
Alexandre Julliard
julliard at winehq.org
Thu Mar 10 16:10:16 CST 2022
Module: wine
Branch: master
Commit: 4259f9333777406b7b3bc78cb453eb0cf4426013
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4259f9333777406b7b3bc78cb453eb0cf4426013
Author: Paul Gofman <pgofman at codeweavers.com>
Date: Thu Mar 10 12:40:52 2022 +0300
ws2_32: Manage shorter length for TCP_NODELAY.
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ws2_32/socket.c | 18 ++++++++++++------
dlls/ws2_32/tests/sock.c | 1 +
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 9f140a6ee44..80665ff57a4 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -1725,6 +1725,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl
switch(optname)
{
case TCP_NODELAY:
+ if (*optlen < 1 || !optval)
+ {
+ SetLastError( WSAEFAULT );
+ return SOCKET_ERROR;
+ }
+ *optlen = 1;
return server_getsockopt( s, IOCTL_AFD_WINE_GET_TCP_NODELAY, optval, optlen );
default:
@@ -2998,14 +3004,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int
switch(optname)
{
case TCP_NODELAY:
- {
- INT nodelay = *optval;
- if (optlen <= 0) {
- SetLastError(WSAEFAULT);
+ if (optlen <= 0 || !optval)
+ {
+ SetLastError( optlen && optval ? WSAENOBUFS : WSAEFAULT );
return SOCKET_ERROR;
}
- return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) );
- }
+ value = *optval;
+ return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&value, sizeof(value) );
+
default:
FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname);
SetLastError(WSAENOPROTOOPT);
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index dfa1640e8bc..afdfc68905b 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1181,6 +1181,7 @@ static void test_set_getsockopt(void)
{AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDBUF, FALSE, {1, 2, 4}, {0xdeadbe00, 0xdead0000}, TRUE},
{AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE},
{AF_INET, SOCK_STREAM, SOL_SOCKET, SO_OPENTYPE, FALSE, {1, 2, 4}, {0}, TRUE},
+ {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_NODELAY, TRUE, {1, 1, 1}, {0}, TRUE},
{AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE},
{AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}, {0}, FALSE},
{AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TOS, TRUE, {1, 1, 4}, {0}, FALSE},
More information about the wine-cvs
mailing list