diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2023-04-06 03:19:32 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-04-06 13:27:16 +1000 |
| commit | 2519110659a1efac6c976895a86659d1b341c91b (patch) | |
| tree | f04287b636687c1c9923f5c92fdd28e2744df5c7 | |
| parent | 3b9ceaad7ad63c1c03c2a89e148340ad3a62a482 (diff) | |
| download | openssh-git-2519110659a1efac6c976895a86659d1b341c91b.tar.gz | |
upstream: match_user() shouldn't be called with user==NULL unless
host and ipaddr are also NULL
OpenBSD-Commit-ID: fa3518346c21483e9e01a2e4b9436ae501daf8ea
| -rw-r--r-- | match.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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); |