Changeset 578 for branches/samba-3.3.x/source/utils

Timestamp:

Jun 25, 2011, 7:14:41 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.15 (security update)

File:

• branches/samba-3.3.x/source/utils/smbfilter.c (modified) (2 diffs)

branches/samba-3.3.x/source/utils/smbfilter.c

@@ -163 +163 @@
                 
                 FD_ZERO(&fds);
-                if (s != -1) FD_SET(s, &fds);
-                if (c != -1) FD_SET(c, &fds);
+                if (s >= 0 && s < FD_SETSIZE) FD_SET(s, &fds);
+                if (c >= 0 && c < FD_SETSIZE) FD_SET(c, &fds);
 
                 num = sys_select_intr(MAX(s+1, c+1),&fds,NULL,NULL,NULL);
@@ -236 +236 @@
                 socklen_t in_addrlen = sizeof(ss);
                 
+                if (s < 0 || s >= FD_SETSIZE) {
+                        break;
+                }
+
                 FD_ZERO(&fds);
                 FD_SET(s, &fds);