Protect against NULL wsaddrlen in ws_sockaddr_alloc.

f6a3a521 · Lawson Whitney · Alexandre Julliard · f98c52b1 · f6a3a521
Commit f6a3a521 authored Feb 14, 2002 by Lawson Whitney Committed by Alexandre Julliard Feb 14, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -838,12 +838,12 @@ static const struct sockaddr* ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr,
 /* allocates a Unix sockaddr structure to receive the data */
 inline struct sockaddr* ws_sockaddr_alloc(const struct WS_sockaddr* wsaddr, int* wsaddrlen, int* uaddrlen)
 {
+    if (wsaddr==NULL)
+        return NULL;
    if (*wsaddrlen==0)
        *uaddrlen=0;
    else
        *uaddrlen=max(sizeof(struct sockaddr),*wsaddrlen);
-    if (wsaddr==NULL)
-        return NULL;

    return malloc(*uaddrlen);
 }