Index: dll/win32/msafd/misc/dllmain.c
===================================================================
--- dll/win32/msafd/misc/dllmain.c	(revision 72750)
+++ dll/win32/msafd/misc/dllmain.c	(working copy)
@@ -1410,7 +1410,7 @@
                        &ListenReceiveData->Address.Address[0].AddressType,
                        sizeof(*RemoteAddress));
         if( SocketAddressLength )
-            *SocketAddressLength = ListenReceiveData->Address.Address[0].AddressLength;
+            *SocketAddressLength = sizeof(*RemoteAddress);
     }
 
     NtClose( SockEvent );