diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-09-02 13:46:10 +0300 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-09-02 22:59:44 +0200 |
| commit | 64b125700eb472787eea6dba9d2ca29d8bc360d7 (patch) | |
| tree | 38bda65935a1e126b3d48b7b37e08c07d540aa9a /src/session.c | |
| parent | 6f650a61ca67c8f799a3c3d2f0c17bdd42136e5f (diff) | |
| download | libssh-64b125700eb472787eea6dba9d2ca29d8bc360d7.tar.gz libssh-64b125700eb472787eea6dba9d2ca29d8bc360d7.tar.xz libssh-64b125700eb472787eea6dba9d2ca29d8bc360d7.zip | |
channels: replaced bugged lists with ssh_list
(cherry picked from commit 6d8bb956c5caa48c2aba6713f067224650c3c1e1)
Conflicts:
src/channels.c
src/session.c
Diffstat (limited to 'src/session.c')
| -rw-r--r-- | src/session.c | 9 |
1 files changed, 6 insertions, 3 deletions
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 */ |