1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00

Fix a segfault on abrupt X connection shutdown.

[originally from svn r998]
This commit is contained in:
Simon Tatham 2001-03-15 11:19:59 +00:00
parent cb9c2e79b9
commit c760ef6f83
2 changed files with 5 additions and 2 deletions

2
ssh.c
View File

@ -1982,7 +1982,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
} }
void sshfwd_close(struct ssh_channel *c) { void sshfwd_close(struct ssh_channel *c) {
if (c) { if (c && !c->closes) {
if (ssh_version == 1) { if (ssh_version == 1) {
send_packet(SSH1_MSG_CHANNEL_CLOSE, PKT_INT, c->remoteid, PKT_END); send_packet(SSH1_MSG_CHANNEL_CLOSE, PKT_INT, c->remoteid, PKT_END);
} else { } else {

View File

@ -189,7 +189,10 @@ char *x11_init (Socket *s, char *display, void *c) {
} }
void x11_close (Socket s) { void x11_close (Socket s) {
struct X11Private *pr = (struct X11Private *)sk_get_private_ptr(s); struct X11Private *pr;
if (!s)
return;
pr = (struct X11Private *)sk_get_private_ptr(s);
if (pr->auth_protocol) { if (pr->auth_protocol) {
sfree(pr->auth_protocol); sfree(pr->auth_protocol);