Changeset 9887 for trunk/src/wsock32/wsock32.cpp

Timestamp:

Mar 3, 2003, 5:34:39 PM (22 years ago)

Author:

sandervl

Message:

Removed wrong checks for invalid address parameters in sendto & recvfrom

File:

• trunk/src/wsock32/wsock32.cpp (modified) (4 diffs)

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.51 2003-02-24 11:14:56 sandervl Exp $ */
+/* $Id: wsock32.cpp,v 1.52 2003-03-03 16:34:39 sandervl Exp $ */
 
 /*
@@ -724 +724 @@
         return SOCKET_ERROR;
    }
-   else
-   if(fromlen == NULL || *fromlen < (int)sizeof(struct sockaddr_in)) {
-        WSASetLastError(WSAEFAULT);
-        return SOCKET_ERROR;
-   }
-   dprintf(("recvfrom to %s", inet_ntoa(((sockaddr_in*)from)->sin_addr)));
-
+   //NOTE: do not check from & fromlen; they are allowed to be NULL/0
+
+   if(from) {
+       dprintf(("recvfrom to %s", inet_ntoa(((sockaddr_in*)from)->sin_addr)));
+   }
    ret = recvfrom(s, buf, len, flags, from, fromlen);
 
@@ -822 +820 @@
         return SOCKET_ERROR;
    }
-   else
-   if(tolen < (int)sizeof(struct sockaddr_in)) {
-        WSASetLastError(WSAEFAULT);
-        return SOCKET_ERROR;
-   }
+   //NOTE: do not check to & tolen; they are allowed to be NULL/0
+
    // check if the socket is a raw socket and has the IP_HDRINCL switch
    // if this is the case, we overwrite the IP header length field with
@@ -837 +832 @@
        *(u_short *)&buf[2] = len;
    }
-   dprintf(("sending to %s", inet_ntoa(((sockaddr_in*)to)->sin_addr)));
+   if(to) {
+       dprintf(("sending to %s", inet_ntoa(((sockaddr_in*)to)->sin_addr)));
+   }
 #ifdef DUMP_PACKETS
    dprintf2(("Packet length %d", len));