nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-02-04 06:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Be prepared for x11_setup_display() to return NULL (for instance, if DISPLAY

Browse Source 
has invalid contents). Simply refuse to try X forwarding in this circumstance.

[originally from svn r8390]
This commit is contained in:
Jacob Nevins 2009-01-05 22:53:14 +00:00
parent 3e6111243c
commit 7843fb79d1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ssh.c
View File

@ -4996,10 +4996,10 @@ static void do_ssh1_connection(Ssh ssh, unsigned char *in, int inlen,
} }
} }
if (ssh->cfg.x11_forward) { if (ssh->cfg.x11_forward &&
(ssh->x11disp = x11_setup_display(ssh->cfg.x11_display,
ssh->cfg.x11_auth, &ssh->cfg))) {
logevent("Requesting X11 forwarding"); logevent("Requesting X11 forwarding");
ssh->x11disp = x11_setup_display(ssh->cfg.x11_display,
ssh->cfg.x11_auth, &ssh->cfg);
/* /*
* Note that while we blank the X authentication data here, we don't * Note that while we blank the X authentication data here, we don't
* take any special action to blank the start of an X11 channel, * take any special action to blank the start of an X11 channel,
@ -8577,10 +8577,10 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
/* /*
* Potentially enable X11 forwarding. * Potentially enable X11 forwarding.
*/ */
if (ssh->mainchan && !ssh->ncmode && ssh->cfg.x11_forward) { if (ssh->mainchan && !ssh->ncmode && ssh->cfg.x11_forward &&
(ssh->x11disp = x11_setup_display(ssh->cfg.x11_display,
ssh->cfg.x11_auth, &ssh->cfg))) {
logevent("Requesting X11 forwarding"); logevent("Requesting X11 forwarding");
ssh->x11disp = x11_setup_display(ssh->cfg.x11_display,
ssh->cfg.x11_auth, &ssh->cfg);
s->pktout = ssh2_pkt_init(SSH2_MSG_CHANNEL_REQUEST); s->pktout = ssh2_pkt_init(SSH2_MSG_CHANNEL_REQUEST);
ssh2_pkt_adduint32(s->pktout, ssh->mainchan->remoteid); ssh2_pkt_adduint32(s->pktout, ssh->mainchan->remoteid);
ssh2_pkt_addstring(s->pktout, "x11-req"); ssh2_pkt_addstring(s->pktout, "x11-req");