Paul Gofman : ws2_32: Manage shorter length for SO_DONTLINGER.
Alexandre Julliard
julliard at winehq.org
Tue Mar 8 16:10:50 CST 2022
Module: wine
Branch: master
Commit: a73cb3f13734d7283d0c45a3f801dbbff06aa332
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a73cb3f13734d7283d0c45a3f801dbbff06aa332
Author: Paul Gofman <pgofman at codeweavers.com>
Date: Tue Mar 8 12:22:49 2022 +0300
ws2_32: Manage shorter length for SO_DONTLINGER.
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 | 12 +++++++-----
dlls/ws2_32/tests/sock.c | 1 +
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 3a1b230435a..e58fc21c9f2 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -1488,11 +1488,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl
case SO_DONTLINGER:
{
- struct linger linger;
+ LINGER linger;
int len = sizeof(linger);
+ BOOL value;
int ret;
- if (*optlen < sizeof(BOOL)|| !optval)
+ if (*optlen < 1 || !optval)
{
SetLastError(WSAEFAULT);
return SOCKET_ERROR;
@@ -1500,8 +1501,9 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl
if (!(ret = getsockopt( s, SOL_SOCKET, SO_LINGER, (char *)&linger, &len )))
{
- *(BOOL *)optval = !linger.l_onoff;
- *optlen = sizeof(BOOL);
+ value = !linger.l_onoff;
+ memcpy( optval, &value, min( sizeof(BOOL), *optlen ));
+ *optlen = *optlen >= sizeof(BOOL) ? sizeof(BOOL) : 1;
}
return ret;
}
@@ -2805,7 +2807,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int
return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_BROADCAST, (char *)&value, sizeof(value) );
case SO_DONTLINGER:
{
- struct linger linger;
+ LINGER linger;
if (!optval)
{
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index a868bc946a7..5200fb185b4 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1170,6 +1170,7 @@ static void test_set_getsockopt(void)
test_optsize[] =
{
{AF_INET, SOCK_DGRAM, SOL_SOCKET, SO_BROADCAST, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE},
+ {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTLINGER, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE},
{AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}, {0}, TRUE},
{AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE},
{AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE},
More information about the wine-cvs
mailing list