diff options
author | markus@openbsd.org <markus@openbsd.org> | 2020-03-06 18:19:21 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-03-13 13:13:30 +1100 |
commit | a6134b02b5264b2611c8beae98bb392329452bba (patch) | |
tree | 026ee5956e420e8e3d24a794f55893c082e22fc5 /channels.c | |
parent | 16d4f9961c75680aab374dee762a5baa0ad507af (diff) |
upstream: fix uninitialized pointers for forward_cancel; ok djm
OpenBSD-Commit-ID: 612778e6d87ee865d0ba97d0a335f141cee1aa37
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels.c b/channels.c index 19c22c4ef..9683b3363 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.396 2020/02/26 13:40:09 jsg Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.397 2020/03/06 18:19:21 markus 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 |
@@ -4001,7 +4001,7 @@ channel_request_rforward_cancel_tcpip(struct ssh *ssh, | |||
4001 | struct permission_set *pset = &sc->local_perms; | 4001 | struct permission_set *pset = &sc->local_perms; |
4002 | int r; | 4002 | int r; |
4003 | u_int i; | 4003 | u_int i; |
4004 | struct permission *perm; | 4004 | struct permission *perm = NULL; |
4005 | 4005 | ||
4006 | for (i = 0; i < pset->num_permitted_user; i++) { | 4006 | for (i = 0; i < pset->num_permitted_user; i++) { |
4007 | perm = &pset->permitted_user[i]; | 4007 | perm = &pset->permitted_user[i]; |
@@ -4037,7 +4037,7 @@ channel_request_rforward_cancel_streamlocal(struct ssh *ssh, const char *path) | |||
4037 | struct permission_set *pset = &sc->local_perms; | 4037 | struct permission_set *pset = &sc->local_perms; |
4038 | int r; | 4038 | int r; |
4039 | u_int i; | 4039 | u_int i; |
4040 | struct permission *perm; | 4040 | struct permission *perm = NULL; |
4041 | 4041 | ||
4042 | for (i = 0; i < pset->num_permitted_user; i++) { | 4042 | for (i = 0; i < pset->num_permitted_user; i++) { |
4043 | perm = &pset->permitted_user[i]; | 4043 | perm = &pset->permitted_user[i]; |