ws2_32: Test WSAAccept optional callback parameter before trying to use it.

75e511f3 · Jeff Zaroyko · Alexandre Julliard · 25a18037 · 75e511f3
Commit 75e511f3 authored Nov 06, 2008 by Jeff Zaroyko Committed by Alexandre Julliard Nov 06, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

socket.c dlls/ws2_32/socket.c +3 -1

No files found.
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -4386,6 +4386,8 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen,

       if (cs == SOCKET_ERROR) return SOCKET_ERROR;

+       if (!lpfnCondition) return cs;
+
       CallerId.buf = (char *)&src_addr;
       CallerId.len = sizeof(src_addr);

@@ -4428,7 +4430,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen,
                       FIXME("Unknown return type from Condition function\n");
                       SetLastError(WSAENOTSOCK);
                       return SOCKET_ERROR;
-               }
+       }
 }

 /***********************************************************************