From: djm@openbsd.org <djm@openbsd.org>
Date: Thu, 6 Apr 2023 03:19:32 +0000 (+0000)
Subject: upstream: match_user() shouldn't be called with user==NULL unless
X-Git-Tag: V_9_4_P1~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2519110659a1efac6c976895a86659d1b341c91b;p=thirdparty%2Fopenssh-portable.git

upstream: match_user() shouldn't be called with user==NULL unless

host and ipaddr are also NULL

OpenBSD-Commit-ID: fa3518346c21483e9e01a2e4b9436ae501daf8ea
---

diff --git a/match.c b/match.c
index 3ac854d38..d6af2561f 100644
--- a/match.c
+++ b/match.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: match.c,v 1.43 2020/11/03 22:53:12 djm Exp $ */
+/* $OpenBSD: match.c,v 1.44 2023/04/06 03:19:32 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -247,6 +247,9 @@ match_user(const char *user, const char *host, const char *ipaddr,
 		return 0;
 	}
 
+	if (user == NULL)
+		return 0; /* shouldn't happen */
+
 	if ((p = strchr(pattern, '@')) == NULL)
 		return match_pattern(user, pattern);