From 64b125700eb472787eea6dba9d2ca29d8bc360d7 Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Fri, 2 Sep 2011 13:46:10 +0300 Subject: channels: replaced bugged lists with ssh_list (cherry picked from commit 6d8bb956c5caa48c2aba6713f067224650c3c1e1) Conflicts: src/channels.c src/session.c --- src/session.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/session.c') diff --git a/src/session.c b/src/session.c index 4f0ef1e8..214e17a1 100644 --- a/src/session.c +++ b/src/session.c @@ -157,7 +157,7 @@ err: */ void ssh_free(ssh_session session) { int i; - enter_function(); + struct ssh_iterator *it; if (session == NULL) { return; @@ -187,9 +187,12 @@ void ssh_free(ssh_session session) { ssh_poll_ctx_free(session->default_poll_ctx); } /* delete all channels */ - while (session->channels) { - ssh_channel_free(session->channels); + while ((it=ssh_list_get_iterator(session->channels)) != NULL) { + ssh_channel_free(ssh_iterator_value(ssh_channel,it)); + ssh_list_remove(session->channels, it); } + ssh_list_free(session->channels); + session->channels=NULL; #ifndef _WIN32 agent_free(session->agent); #endif /* _WIN32 */ -- cgit