diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | channels.c | 6 | ||||
-rw-r--r-- | session.c | 13 |
3 files changed, 15 insertions, 11 deletions
@@ -8,6 +8,11 @@ | |||
8 | [sshd.8] | 8 | [sshd.8] |
9 | Add more detail about what permissions are and aren't accepted for | 9 | Add more detail about what permissions are and aren't accepted for |
10 | authorized_keys files. Corrections jmc@, ok djm@, "looks good" jmc@ | 10 | authorized_keys files. Corrections jmc@, ok djm@, "looks good" jmc@ |
11 | - djm@cvs.openbsd.org 2006/08/29 10:40:19 | ||
12 | [channels.c session.c] | ||
13 | normalise some inconsistent (but harmless) NULL pointer checks | ||
14 | spotted by the Stanford SATURN tool, via Isil Dillig; | ||
15 | ok markus@ deraadt@ | ||
11 | 16 | ||
12 | 20060824 | 17 | 20060824 |
13 | - (dtucker) [openbsd-compat/basename.c] Include errno.h. | 18 | - (dtucker) [openbsd-compat/basename.c] Include errno.h. |
@@ -5310,4 +5315,4 @@ | |||
5310 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 5315 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
5311 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 5316 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
5312 | 5317 | ||
5313 | $Id: ChangeLog,v 1.4512 2006/08/30 01:07:00 djm Exp $ | 5318 | $Id: ChangeLog,v 1.4513 2006/08/30 01:07:39 djm Exp $ |
diff --git a/channels.c b/channels.c index dfa1e591b..26b63a1aa 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.265 2006/08/03 03:34:41 deraadt Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.266 2006/08/29 10:40:18 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -3164,9 +3164,7 @@ x11_request_forwarding_with_spoofing(int client_session_id, const char *disp, | |||
3164 | return; | 3164 | return; |
3165 | } | 3165 | } |
3166 | 3166 | ||
3167 | cp = disp; | 3167 | cp = strchr(disp, ':'); |
3168 | if (disp) | ||
3169 | cp = strchr(disp, ':'); | ||
3170 | if (cp) | 3168 | if (cp) |
3171 | cp = strchr(cp, '.'); | 3169 | cp = strchr(cp, '.'); |
3172 | if (cp) | 3170 | if (cp) |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.c,v 1.218 2006/08/18 09:15:20 markus Exp $ */ | 1 | /* $OpenBSD: session.c,v 1.219 2006/08/29 10:40:19 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -2255,12 +2255,13 @@ session_close(Session *s) | |||
2255 | if (s->auth_proto) | 2255 | if (s->auth_proto) |
2256 | xfree(s->auth_proto); | 2256 | xfree(s->auth_proto); |
2257 | s->used = 0; | 2257 | s->used = 0; |
2258 | for (i = 0; i < s->num_env; i++) { | 2258 | if (s->env != NULL) { |
2259 | xfree(s->env[i].name); | 2259 | for (i = 0; i < s->num_env; i++) { |
2260 | xfree(s->env[i].val); | 2260 | xfree(s->env[i].name); |
2261 | } | 2261 | xfree(s->env[i].val); |
2262 | if (s->env != NULL) | 2262 | } |
2263 | xfree(s->env); | 2263 | xfree(s->env); |
2264 | } | ||
2264 | session_proctitle(s); | 2265 | session_proctitle(s); |
2265 | } | 2266 | } |
2266 | 2267 | ||