From 9e379835c4ebbfef41440416fc72518e48ea8dde Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Tue, 29 Sep 2015 22:19:11 +0800
Subject: [PATCH] avoid invalidated iterator when connection fails
---
netio.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/netio.c b/netio.c
index a8006a75..6c13a006 100644
--- a/netio.c
+++ b/netio.c
@@ -174,28 +174,26 @@ void remove_connect_pending() {
void set_connect_fds(fd_set *writefd) {
m_list_elem *iter;
- TRACE(("enter handle_connect_fds"))
- for (iter = ses.conn_pending.first; iter; iter = iter->next) {
+ TRACE(("enter set_connect_fds"))
+ iter = ses.conn_pending.first;
+ while (iter) {
+ m_list_elem *next_iter = iter->next;
struct dropbear_progress_connection *c = iter->item;
/* Set one going */
- while (c->res_iter && c->sock < 0)
- {
+ while (c->res_iter && c->sock < 0) {
connect_try_next(c);
}
if (c->sock >= 0) {
FD_SET(c->sock, writefd);
} else {
- m_list_elem *remove_iter;
/* Final failure */
if (!c->errstring) {
c->errstring = m_strdup("unexpected failure");
}
c->cb(DROPBEAR_FAILURE, -1, c->cb_data, c->errstring);
- /* Safely remove without invalidating iter */
- remove_iter = iter;
- iter = iter->prev;
- remove_connect(c, remove_iter);
+ remove_connect(c, iter);
}
+ iter = next_iter;
}
}
--
GitLab