Changeset 593 for trunk/server/source3/lib

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.7

Location:

trunk/server/source3/lib

Files:

• events.c (modified) (1 diff)
• g_lock.c (modified) (1 diff)
• packet.c (modified) (1 diff)
• readline.c (modified) (1 diff)
• select.c (modified) (2 diffs)
• util_sock.c (modified) (4 diffs)

trunk/server/source3/lib/events.c

@@ -56 +56 @@
 
         for (fde = ev->fd_events; fde; fde = fde->next) {
+
+
+
+
+
+
+
+
                 if (fde->flags & EVENT_FD_READ) {
                         FD_SET(fde->fd, read_fds);

trunk/server/source3/lib/g_lock.c

@@ -392 +392 @@
                         FD_ZERO(r_fds);
                         max_fd = ctdbd_conn_get_fd(conn);
-                        FD_SET(max_fd, r_fds);
+                        if (max_fd >= 0 && max_fd < FD_SETSIZE) {
+                                FD_SET(max_fd, r_fds);
+                        }
                 }
 #endif

trunk/server/source3/lib/packet.c

@@ -108 +108 @@
         fd_set r_fds;
 
+
+
+
+
+
         FD_ZERO(&r_fds);
         FD_SET(ctx->fd, &r_fds);

trunk/server/source3/lib/readline.c

@@ -92 +92 @@
                 timeout.tv_usec = 0;
 
+
+
+
+
+
                 FD_ZERO(&fds);
                 FD_SET(fd,&fds);

trunk/server/source3/lib/select.c

@@ -80 +80 @@
                 }
 
+
+
+
+
+
+
+
+
+
+
+
                 /*
                  * These next two lines seem to fix a bug with the Linux
@@ -106 +117 @@
                 FD_ZERO(readfds2);
         }
+
         FD_SET(select_pipe[0], readfds2);
 

trunk/server/source3/lib/util_sock.c

@@ -496 +496 @@
 
         for (nread=0; nread < mincnt; ) {
+
+
+
+
+
                 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)
                         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