diff options
| author |   markus <markus@openbsd.org> | 2005-09-07 08:53:53 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2005-09-07 08:53:53 +0000 |
| commit | 4726adbf9029d4ea0b9211827d5fac23b352e027 (patch) | |
| tree | e510df450f74102aae18796597783b05d223b43f /usr.bin/ssh/channels.c | |
| parent | SiS 182 SATA apparently acts in a non standard way and needs (diff) | |
| download | wireguard-openbsd-4726adbf9029d4ea0b9211827d5fac23b352e027.tar.xz wireguard-openbsd-4726adbf9029d4ea0b9211827d5fac23b352e027.zip | |
enforce chanid != NULL; ok djm
Diffstat (limited to 'usr.bin/ssh/channels.c')
| -rw-r--r-- | usr.bin/ssh/channels.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index db136686dc2..fea40009a48 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.223 2005/07/17 07:17:54 djm Exp $"); +RCSID("$OpenBSD: channels.c,v 1.224 2005/09/07 08:53:53 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -2656,6 +2656,9 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost, char strport[NI_MAXSERV]; int gaierr, n, num_socks = 0, socks[NUM_SOCKS]; + if (chanids == NULL) + return -1; + for (display_number = x11_display_offset; display_number < MAX_DISPLAYS; display_number++) { @@ -2715,8 +2718,7 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost, } /* Allocate a channel for each socket. */ - if (chanids != NULL) - *chanids = xmalloc(sizeof(**chanids) * (num_socks + 1)); + *chanids = xmalloc(sizeof(**chanids) * (num_socks + 1)); for (n = 0; n < num_socks; n++) { sock = socks[n]; nc = channel_new("x11 listener", @@ -2724,11 +2726,9 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost, CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "X11 inet listener", 1); nc->single_connection = single_connection; - if (*chanids != NULL) - (*chanids)[n] = nc->self; + (*chanids)[n] = nc->self; } - if (*chanids != NULL) - (*chanids)[n] = -1; + (*chanids)[n] = -1; /* Return the display number for the DISPLAY environment variable. */ *display_numberp = display_number; |