Merge branch 'pre-0.65'

diff --git a/ssh.c b/ssh.c
index 46f1d76dc32b9592f20d7c70b8f1d4716bc008c3..b654eb17e7d8c4bbd086461e40d8980779c8f39f 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -7817,7 +7817,7 @@ static void ssh_check_termination(Ssh ssh)
 {
     if (ssh->version == 2 &&
         !conf_get_int(ssh->conf, CONF_ssh_no_shell) &&
-        count234(ssh->channels) == 0 &&
+        (ssh->channels && count234(ssh->channels) == 0) &&
         !(ssh->connshare && share_ndownstreams(ssh->connshare) > 0)) {
         /*
          * We used to send SSH_MSG_DISCONNECT here, because I'd