From 6f9fea7fd5b3801231fa1938cead6efab54c5ea9 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cynapses.org>
Date: Sun, 20 Jun 2010 21:16:29 +0200
Subject: poll: Check if maxfd has been set.

---
 libssh/poll.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libssh/poll.c b/libssh/poll.c
index 0de7a235..27e76333 100644
--- a/libssh/poll.c
+++ b/libssh/poll.c
@@ -135,7 +135,7 @@ static int bsd_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout) {
   FD_ZERO (&exceptfds);
 
   /* compute fd_sets and find largest descriptor */
-  for (max_fd = 0, i = 0; i < nfds; i++) {
+  for (rc = -1; max_fd = 0, i = 0; i < nfds; i++) {
       if (fds[i].fd == SSH_INVALID_SOCKET) {
           continue;
       }
@@ -154,10 +154,11 @@ static int bsd_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout) {
                             POLLRDNORM | POLLRDBAND |
                             POLLWRNORM | POLLWRBAND))) {
           max_fd = fds[i].fd;
+          rc = 0;
       }
   }
 
-  if (max_fd == SSH_INVALID_SOCKET) {
+  if (max_fd == SSH_INVALID_SOCKET || rc = -1) {
       errno = EINVAL;
       return -1;
   }
-- 
cgit