From f6a3a521802904ef352b0827a8c00b405cc9f46b Mon Sep 17 00:00:00 2001 From: Lawson Whitney Date: Thu, 14 Feb 2002 19:20:12 +0000 Subject: [PATCH] Protect against NULL wsaddrlen in ws_sockaddr_alloc. --- dlls/winsock/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index c2dd88d6354..ed0800156cb 100644 --- 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); }