X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frecvfrom.c;h=5ce2b12740de48c1a94778bce3ebfa3c0ee9db97;hb=6815bc73969d38c2226cf6e3366c1e4f4f756ba0;hp=5edd1d8b1c9df7fe79ad87098f997b1b203fe8d4;hpb=d599e5add275f75ed08e6527b8ee4d3f4f7c3aea;p=gnulib.git

diff --git a/lib/recvfrom.c b/lib/recvfrom.c
index 5edd1d8b1..5ce2b1274 100644
--- a/lib/recvfrom.c
+++ b/lib/recvfrom.c
@@ -32,17 +32,27 @@ ssize_t
 rpl_recvfrom (int fd, void *buf, size_t len, int flags, struct sockaddr *from,
               socklen_t *fromlen)
 {
-  int frombufsize = (from != NULL ? *fromlen : 0);
   SOCKET sock = FD_TO_SOCKET (fd);
-  int r = recvfrom (sock, buf, len, flags, from, fromlen);
 
-  if (r < 0)
-    set_winsock_errno ();
-
-  /* Winsock recvfrom() only returns a valid 'from' when the socket is
-     connectionless.  POSIX gives a valid 'from' for all types of sockets.  */
-  else if (from != NULL && *fromlen == frombufsize)
-    rpl_getpeername (fd, from, fromlen);
-
-  return r;
+  if (sock == INVALID_SOCKET)
+    {
+      errno = EBADF;
+      return -1;
+    }
+  else
+    {
+      int frombufsize = (from != NULL ? *fromlen : 0);
+      int r = recvfrom (sock, buf, len, flags, from, fromlen);
+
+      if (r < 0)
+        set_winsock_errno ();
+
+      /* Winsock recvfrom() only returns a valid 'from' when the socket is
+         connectionless.  POSIX gives a valid 'from' for all types of
+         sockets.  */
+      else if (from != NULL && *fromlen == frombufsize)
+        rpl_getpeername (fd, from, fromlen);
+
+      return r;
+    }
 }