WS2_register_async_shutdown(): Try immediate completion, in case an

app never waits for anything. WS_accept(): Avoid crash if addr parameter is NULL.

WS2_register_async_shutdown(): Try immediate completion, in case an
9dccb294 · Martin Wilck · Alexandre Julliard · 40681ff2 · 9dccb294
Commit 9dccb294 authored Sep 06, 2002 by Martin Wilck Committed by Alexandre Julliard Sep 06, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

socket.c dlls/winsock/socket.c +8 -2

No files found.
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -1371,7 +1371,12 @@ static int WS2_register_async_shutdown ( SOCKET s, int fd, int type )
        ws2_async_cleanup ( &wsa->async );
        goto out;
    }
-    return 0;
+    /* Try immediate completion */
+    if ( WSAGetOverlappedResult ( (HANDLE) s, ovl, NULL, FALSE, NULL ) )
+        return 0;
+    if ( (err = WSAGetLastError ()) == WSA_IO_INCOMPLETE )
+        return 0;
+    return WSAEINVAL;
 out_close:
    WSACloseEvent ( ovl->hEvent );
@@ -1414,7 +1419,8 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr,
        SERVER_END_REQ;
 	if (as)
 	{
-	    WS_getpeername(as, addr, addrlen32);
+	    if (addr)
+                WS_getpeername(as, addr, addrlen32);
 	    return as;
 	}
    }