diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-09-06 01:58:50 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-09-06 12:01:45 +1000 |
| commit | 00865c29690003b4523cc09a0e104724b9f911a4 (patch) | |
| tree | be6d9a29edb877fc52ad3e50914c2d921bb1fd1c /kex.c | |
| parent | afdf27f5aceb4973b9f5308f4310c6e3fd8db1fb (diff) | |
| download | openssh-git-00865c29690003b4523cc09a0e104724b9f911a4.tar.gz | |
upstream: better error code for bad arguments; inspired by
OpenBSD-Commit-ID: dfc263b6041de7f0ed921a1de0b81ddebfab1e0a
Diffstat (limited to 'kex.c')
| -rw-r--r-- | kex.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.152 2019/09/05 09:35:19 djm Exp $ */ +/* $OpenBSD: kex.c,v 1.153 2019/09/06 01:58:50 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -223,7 +223,10 @@ kex_assemble_names(char **listp, const char *def, const char *all) char *list = NULL, *ret = NULL, *matching = NULL, *opatterns = NULL; int r = SSH_ERR_INTERNAL_ERROR; - if (listp == NULL || *listp == NULL || **listp == '\0') { + if (listp == NULL || def == NULL || all == NULL) + return SSH_ERR_INVALID_ARGUMENT; + + if (*listp == NULL || **listp == '\0') { if ((*listp = strdup(def)) == NULL) return SSH_ERR_ALLOC_FAIL; return 0; |