Changeset 578 for branches/samba-3.3.x/source/lib/events.c

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/lib/events.c (modified) (2 diffs)

branches/samba-3.3.x/source/lib/events.c

@@ -141 +141 @@
         struct fd_event *fde;
 
+        if (fd < 0 || fd >= FD_SETSIZE) {
+                errno = EBADF;
+                return NULL;
+        }
+
         if (!(fde = TALLOC_P(mem_ctx, struct fd_event))) {
                 return NULL;
@@ -191 +196 @@
 
         for (fde = event_ctx->fd_events; fde; fde = fde->next) {
+                if (fde->fd < 0 || fde->fd >= FD_SETSIZE) {
+                        /* We ignore here, as it shouldn't be
+                           possible to add an invalid fde->fd
+                           but we don't want FD_SET to see an
+                           invalid fd. */
+                        continue;
+                }
+
                 if (fde->flags & EVENT_FD_READ) {
                         FD_SET(fde->fd, read_fds);