Changeset 593 for trunk/server/source3/lib/util_sock.c

Timestamp:

Jul 1, 2011, 10:18:23 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.7

File:

• trunk/server/source3/lib/util_sock.c (modified) (4 diffs)

trunk/server/source3/lib/util_sock.c

@@ -496 +496 @@
 
         for (nread=0; nread < mincnt; ) {
+                if (fd < 0 || fd >= FD_SETSIZE) {
+                        errno = EBADF;
+                        return map_nt_error_from_unix(EBADF);
+                }
+
                 FD_ZERO(&fds);
                 FD_SET(fd,&fds);
@@ -1236 +1241 @@
         for (i=0; i<num_addrs; i++) {
                 sockets[i] = socket(addrs[i].ss_family, SOCK_STREAM, 0);
-                if (sockets[i] < 0)
+                if (sockets[i] < 0 || sockets[i] >= FD_SETSIZE)
                         goto done;
                 set_blocking(sockets[i], false);
@@ -1285 +1290 @@
 
         for (i=0; i<num_addrs; i++) {
-                if (sockets[i] == -1)
+                if (sockets[i] < 0 || sockets[i] >= FD_SETSIZE) {
+                        /* This cannot happen - ignore if so. */
                         continue;
+                }
                 FD_SET(sockets[i], &wr_fds);
                 FD_SET(sockets[i], &r_fds);
@@ -1306 +1313 @@
         for (i=0; i<num_addrs; i++) {
 
-                if (sockets[i] == -1)
+                if (sockets[i] < 0 || sockets[i] >= FD_SETSIZE) {
+                        /* This cannot happen - ignore if so. */
                         continue;
+                }
 
                 /* Stevens, Network Programming says that if there's a