std.socket: Throw appropriate exception in local/remoteAddress

CyberShadow · Sep 7, 2011 · 6d710cc · 6d710cc
1 parent 4698949
commit 6d710cc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/std/socket.d b/std/socket.d
@@ -2172,8 +2172,10 @@ public:
     {
         Address addr = createAddress();
         socklen_t nameLen = addr.nameLen();
-        if(_SOCKET_ERROR == .getpeername(sock, addr.name(), &nameLen) || nameLen > addr.nameLen())
+        if(_SOCKET_ERROR == .getpeername(sock, addr.name(), &nameLen))
             throw new SocketOSException("Unable to obtain remote socket address");
+        if(nameLen > addr.nameLen())
+            throw new SocketParameterException("Not enough socket address storage");
         assert(addr.addressFamily() == _family);
         return addr;
     }
@@ -2183,8 +2185,10 @@ public:
     {
         Address addr = createAddress();
         socklen_t nameLen = addr.nameLen();
-        if(_SOCKET_ERROR == .getsockname(sock, addr.name(), &nameLen) || nameLen > addr.nameLen())
+        if(_SOCKET_ERROR == .getsockname(sock, addr.name(), &nameLen))
             throw new SocketOSException("Unable to obtain local socket address");
+        if(nameLen > addr.nameLen())
+            throw new SocketParameterException("Not enough socket address storage");
         assert(addr.addressFamily() == _family);
         return addr;
     }