[PATCH 2/6] ws2_32: Manager shorter length for SO_BROADCAST.
Paul Gofman
pgofman at codeweavers.com
Thu Mar 3 11:05:37 CST 2022
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
---
dlls/ws2_32/socket.c | 15 ++++++++++++---
dlls/ws2_32/tests/sock.c | 1 +
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index e5e29107853..c9afbaa8eba 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -1412,7 +1412,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:
{
@@ -2769,6 +2771,8 @@ static int server_setsockopt( SOCKET s, ULONG code, const char *optval, int optl
*/
int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int optlen )
{
+ DWORD value = 0;
+
TRACE( "socket %#Ix, %s, optval %s, optlen %d\n",
s, debugstr_sockopt(level, optname), debugstr_optval(optval, optlen), optlen );
@@ -2785,8 +2789,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 (optlen <= 0)
+ {
+ 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 0eece82bfb1..56ef78ad040 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1167,6 +1167,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_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