Paul Gofman : ws2_32: Manage shorter length for SO_BROADCAST.
Alexandre Julliard
julliard at winehq.org
Tue Mar 8 16:10:50 CST 2022
Module: wine
Branch: master
Commit: 666eb2c628bb0704dd0e812e02f787aef97d10c5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=666eb2c628bb0704dd0e812e02f787aef97d10c5
Author: Paul Gofman <pgofman at codeweavers.com>
Date: Tue Mar 8 12:22:48 2022 +0300
ws2_32: Manage shorter length for SO_BROADCAST.
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 | 13 ++++++++++---
dlls/ws2_32/tests/sock.c | 1 +
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index e708d0d2f5e..3a1b230435a 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -1419,7 +1419,9 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl
return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ACCEPTCONN, optval, optlen );
case SO_BROADCAST:
- return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_BROADCAST, optval, optlen );
+ ret = server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_BROADCAST, optval, optlen );
+ if (!ret && *optlen < sizeof(DWORD)) *optlen = 1;
+ return ret;
case SO_BSP_STATE:
{
@@ -2794,8 +2796,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int
switch(optname)
{
case SO_BROADCAST:
- return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_BROADCAST, optval, optlen );
-
+ if (!optval)
+ {
+ SetLastError( WSAEFAULT );
+ return SOCKET_ERROR;
+ }
+ memcpy( &value, optval, min( optlen, sizeof(value) ));
+ return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_BROADCAST, (char *)&value, sizeof(value) );
case SO_DONTLINGER:
{
struct linger linger;
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 0fab10b4d70..a868bc946a7 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1169,6 +1169,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_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