nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

connection_fatal() should be called after ssh_closing() and other accesses to

Browse Source 
`ssh', since it potentially frees it and potentially doesn't return.
Only affected a couple of rare circumstances.

[originally from svn r5787]
This commit is contained in:
Jacob Nevins 2005-05-16 14:41:08 +00:00
parent 680a32d5bc
commit b742913984
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ssh.c
View File

@ -3514,9 +3514,9 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
PKT_STR, "No more passwords available to try", PKT_STR, "No more passwords available to try",
PKT_END); PKT_END);
logevent("Unable to authenticate"); logevent("Unable to authenticate");
connection_fatal(ssh->frontend, "Unable to authenticate");
ssh->close_expected = TRUE; ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0); ssh_closing((Plug)ssh, NULL, 0, 0);
connection_fatal(ssh->frontend, "Unable to authenticate");
crStop(1); crStop(1);
} }
} else { } else {
@ -6137,9 +6137,9 @@ static void ssh2_msg_channel_request(Ssh ssh, struct Packet *pktin)
ssh2_pkt_addstring(pktout, buf); ssh2_pkt_addstring(pktout, buf);
ssh2_pkt_addstring(pktout, "en"); /* language tag */ ssh2_pkt_addstring(pktout, "en"); /* language tag */
ssh2_pkt_send_noqueue(ssh, pktout); ssh2_pkt_send_noqueue(ssh, pktout);
connection_fatal(ssh->frontend, "%s", buf);
ssh->close_expected = TRUE; ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0); ssh_closing((Plug)ssh, NULL, 0, 0);
connection_fatal(ssh->frontend, "%s", buf);
return; return;
} }
@ -7108,10 +7108,10 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
ssh2_pkt_addstring(s->pktout, "en"); /* language tag */ ssh2_pkt_addstring(s->pktout, "en"); /* language tag */
ssh2_pkt_send_noqueue(ssh, s->pktout); ssh2_pkt_send_noqueue(ssh, s->pktout);
logevent("Unable to authenticate"); logevent("Unable to authenticate");
ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0);
connection_fatal(ssh->frontend, connection_fatal(ssh->frontend,
"Unable to authenticate"); "Unable to authenticate");
ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0);
crStopV; crStopV;
} }
} else { } else {