- markus@cvs.openbsd.org 2005/09/07 08:53:53
[channels.c]
enforce chanid != NULL; ok djm
diff --git a/ChangeLog b/ChangeLog
index a8be688..fb05e3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20051003
+ - (dtucker) OpenBSD CVS Sync
+ - markus@cvs.openbsd.org 2005/09/07 08:53:53
+ [channels.c]
+ enforce chanid != NULL; ok djm
+
20050930
- (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype
for strtoll. Patch from o.flebbe at science-computing.de.
@@ -3037,4 +3043,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3901 2005/09/30 00:23:21 dtucker Exp $
+$Id: ChangeLog,v 1.3902 2005/10/03 08:03:05 dtucker Exp $
diff --git a/channels.c b/channels.c
index 8c7b2b3..af858b4 100644
--- a/channels.c
+++ b/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"
@@ -2668,6 +2668,9 @@
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++) {
@@ -2749,8 +2752,7 @@
}
/* 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",
@@ -2758,11 +2760,9 @@
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;