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

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)

Location:

branches/samba-3.3.x/source/client

Files:

• client.c (modified) (1 diff)
• dnsbrowse.c (modified) (2 diffs)

branches/samba-3.3.x/source/client/client.c

@@ -4380 +4380 @@
  again:
 
-        if (cli->fd == -1)
+        if (cli->fd < 0 || cli->fd >= FD_SETSIZE) {
+                errno = EBADF;
                 return;
+        }
 
         FD_ZERO(&fds);

branches/samba-3.3.x/source/client/dnsbrowse.c

@@ -80 +80 @@
                 if (fdset != NULL) {
                         TALLOC_FREE(fdset);
+                }
+
+                if (mdnsfd < 0 || mdnsfd >= FD_SETSIZE) {
+                        errno = EBADF;
+                        break;
                 }
 
@@ -184 +189 @@
                 fdsetsz = howmany(mdnsfd + 1, NFDBITS) * sizeof(fd_mask);
                 fdset = TALLOC_ZERO(ctx, fdsetsz);
+
+                if (mdnsfd < 0 || mdnsfd >= FD_SETSIZE) {
+                        errno = EBADF;
+                        TALLOC_FREE(ctx);
+                        return 1;
+                }
+
                 FD_SET(mdnsfd, fdset);