[PATCH] ws2_32: Copy send buffer data in WS2_ConnectEx().

[Paul Gofman]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50738
Signed-off-by: Paul Gofman 
---
 dlls/ws2_32/socket.c     | 11 +++++++++--
 dlls/ws2_32/tests/sock.c |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 28b14e71c9c..366aa969c36 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3447,14 +3447,18 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n
     else if (ret == WSAEINPROGRESS)
     {
         struct ws2_async *wsa;
+        DWORD size;
+
         ULONG_PTR cvalue = (((ULONG_PTR)ov->hEvent & 1) == 0) ? (ULONG_PTR)ov : 0;

_enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE,
                       FD_CONNECT,
                       FD_WINE_CONNECTED|FD_WINE_LISTENING);

+        size = offsetof( struct ws2_async, iovec[1] ) + sendBufLen;
+
         /* Indirectly call WSASend */
-        if (!(wsa = (struct ws2_async *)alloc_async_io( offsetof( struct ws2_async, iovec[1] ), WS2_async_send )))
+        if (!(wsa = (struct ws2_async *)alloc_async_io( size, WS2_async_send )))
         {
             SetLastError(WSAEFAULT);
         }
@@ -3473,9 +3477,12 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n
             wsa->n_iovecs    = sendBuf ? 1 : 0;
             wsa->first_iovec = 0;
             wsa->completion_func = NULL;
-            wsa->iovec[0].iov_base = sendBuf;
+            wsa->iovec[0].iov_base = sendBuf ? (BYTE *)wsa + offsetof( struct ws2_async, iovec[1] ) : NULL;
             wsa->iovec[0].iov_len  = sendBufLen;

+            if (sendBuf)
+                memcpy( wsa->iovec[0].iov_base, sendBuf, sendBufLen );
+
             status = register_async( ASYNC_TYPE_WRITE, wsa->hSocket, &wsa->io, ov->hEvent,
                                       NULL, (void *)cvalue, iosb );
             if (status != STATUS_PENDING) HeapFree(GetProcessHeap(), 0, wsa);
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index cab25baf1d1..cedbf423d97 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -7296,6 +7296,7 @@ static void test_ConnectEx(void)
     buffer[1] = '2';
     buffer[2] = '3';
     bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, buffer, 3, &bytesReturned, &overlapped);
+    memset(buffer, 0, 3);
     ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "ConnectEx failed: "
         "returned %d + errno %d\n", bret, WSAGetLastError());
     dwret = WaitForSingleObject(overlapped.hEvent, 15000);

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=87545

Your paranoid android.

=== w8 (32 bit report) ===

ws2_32:
sock.c:6268: Test failed: wrong count 0
sock.c:6277: Test failed: wrong count 1

[Jacek Caban]

Hi Paul,

Thanks for looking at it. Ultimately, we don't want those asyncs in 
winsock, but this seems good for now.

On 23.03.2021 19:45, Paul Gofman wrote:
> -
>        wsa->iovec[0].iov_base = sendBuf;
> -
>        wsa->iovec[0].iov_base = sendBuf ? (BYTE *)wsa + offsetof( struct ws2_async, iovec[1] ) : NULL;

I think you could use just &wsa->iovec[1] instead.

Jacek

[Paul Gofman]

Hello Jacek,

thanks, I sent an updated patch.

Yes, I know asyncs are going to ntdll, but I thought we could still
have that bug fixed until that happens.

Regards,
    Paul.

On 3/24/21 19:06, Jacek Caban wrote:
> Hi Paul,
>
> Thanks for looking at it. Ultimately, we don't want those asyncs in
> winsock, but this seems good for now.
>
> On 23.03.2021 19:45, Paul Gofman wrote:
> > -            wsa->iovec[0].iov_base = sendBuf;
> > +            wsa->iovec[0].iov_base = sendBuf ? (BYTE *)wsa +
> > offsetof( struct ws2_async, iovec[1] ) : NULL;
>
> I think you could use just &wsa->iovec[1] instead.
>
> Jacek