From: markus@openbsd.org <markus@openbsd.org>
Date: Fri, 6 Mar 2020 18:19:21 +0000 (+0000)
Subject: upstream: fix uninitialized pointers for forward_cancel; ok djm
X-Git-Tag: V_8_3_P1~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6134b02b5264b2611c8beae98bb392329452bba;p=thirdparty%2Fopenssh-portable.git

upstream: fix uninitialized pointers for forward_cancel; ok djm

OpenBSD-Commit-ID: 612778e6d87ee865d0ba97d0a335f141cee1aa37
---

diff --git a/channels.c b/channels.c
index 19c22c4ef..9683b3363 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.396 2020/02/26 13:40:09 jsg Exp $ */
+/* $OpenBSD: channels.c,v 1.397 2020/03/06 18:19:21 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -4001,7 +4001,7 @@ channel_request_rforward_cancel_tcpip(struct ssh *ssh,
 	struct permission_set *pset = &sc->local_perms;
 	int r;
 	u_int i;
-	struct permission *perm;
+	struct permission *perm = NULL;
 
 	for (i = 0; i < pset->num_permitted_user; i++) {
 		perm = &pset->permitted_user[i];
@@ -4037,7 +4037,7 @@ channel_request_rforward_cancel_streamlocal(struct ssh *ssh, const char *path)
 	struct permission_set *pset = &sc->local_perms;
 	int r;
 	u_int i;
-	struct permission *perm;
+	struct permission *perm = NULL;
 
 	for (i = 0; i < pset->num_permitted_user; i++) {
 		perm = &pset->permitted_user[i];