X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=reactos%2Fdll%2Fwin32%2Fws2_32%2Fsrc%2Fsockctrl.c;h=1bf9e821249e09dc0740222262b0484e68ca7dff;hp=0aa512a09aed4dc0c86bf1db68cef17a5fdecf31;hb=f732630141b7ae838255f836d095946cdb419252;hpb=92d1110c006fc6e89b0241a80ce03027993d22d8

diff --git a/reactos/dll/win32/ws2_32/src/sockctrl.c b/reactos/dll/win32/ws2_32/src/sockctrl.c
index 0aa512a09ae..1bf9e821249 100644
--- a/reactos/dll/win32/ws2_32/src/sockctrl.c
+++ b/reactos/dll/win32/ws2_32/src/sockctrl.c
@@ -217,20 +217,28 @@ getsockname(IN SOCKET s,
         /* Get the Socket Context */
         if ((Socket = WsSockGetSocket(s)))
         {
-            /* Make the call */
-            Status = Socket->Provider->Service.lpWSPGetSockName(s,
-                                                                name,
-                                                                namelen,
-                                                                &ErrorCode);
+            if (name && namelen && (*namelen >= sizeof(*name)))
+            {
+                /* Make the call */
+                Status = Socket->Provider->Service.lpWSPGetSockName(s,
+                                                                    name,
+                                                                    namelen,
+                                                                    &ErrorCode);
 
-            /* Deference the Socket Context */
-            WsSockDereference(Socket);
+                /* Deference the Socket Context */
+                WsSockDereference(Socket);
 
-            /* Return Provider Value */
-            if (Status == ERROR_SUCCESS) return Status;
+                /* Return Provider Value */
+                if (Status == ERROR_SUCCESS) return Status;
 
-            /* If everything seemed fine, then the WSP call failed itself */
-            if (ErrorCode == NO_ERROR) ErrorCode = WSASYSCALLFAILURE;
+                /* If everything seemed fine, then the WSP call failed itself */
+                if (ErrorCode == NO_ERROR) ErrorCode = WSASYSCALLFAILURE;
+            }
+            else
+            {
+                /* name or namelen not valid */
+                ErrorCode = WSAEFAULT;
+            }
         }
         else
         {