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

host and ipaddr are also NULL

diff --git a/usr.bin/ssh/match.c b/usr.bin/ssh/match.c
index a49c04e..5888865 100644 (file)
--- a/usr.bin/ssh/match.c
+++ b/usr.bin/ssh/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
@@ -240,6 +240,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);