[PATCH v2 3/6] ws2_32: Manager shorter length for SO_DONTLINGER.
Paul Gofman
pgofman at codeweavers.com
Thu Mar 3 15:16:29 CST 2022
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
---
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 283404baf5a..b7da3649806 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -1481,11 +1481,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 || *optlen < sizeof(BOOL)|| !optval)
+ if (!optlen || *optlen < 1 || !optval)
{
SetLastError(WSAEFAULT);
return SOCKET_ERROR;
@@ -1493,8 +1494,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;
}
@@ -2798,7 +2800,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 56ef78ad040..5d8c1b169e1 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1168,6 +1168,7 @@ static void test_set_getsockopt(void)
test_optsize[] =
{
{AF_INET, SOCK_DGRAM, SOL_SOCKET, SO_BROADCAST, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}},
+ {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTLINGER, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}},
{AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}},
{AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}},
{AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}},
--
2.35.1
More information about the wine-devel
mailing list