From 809254160308289fdcddf8a5eabad0c85a35bce7 Mon Sep 17 00:00:00 2001
From: milo <milo@r0ot.me>
Date: Wed, 20 Apr 2011 04:09:28 +0200
Subject: [PATCH] [poll] avoid infinite loop in ssh_poll_ctx_free() (cherry
 picked from commit eace59d3eaad413fd846d1c8b4c926285f6cd5ab)

---
 src/poll.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/poll.c b/src/poll.c
index ed2924c6..48991e9c 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -495,7 +495,12 @@ void ssh_poll_ctx_free(ssh_poll_ctx ctx) {
 
       /* force poll object removal */
       if (p->cb && p->cb(p, fd, POLLERR, p->cb_data) < 0) {
-        used = ctx->polls_used;
+        if(ctx->polls_used < used) {
+            used = ctx->polls_used;
+        } else {
+            /* nothing to do */
+            i++;
+        }
       } else {
         i++;
       }