RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: better error code for bad arguments; inspired by 

OpenBSD-Commit-ID: dfc263b6041de7f0ed921a1de0b81ddebfab1e0a
This commit is contained in:
djm@openbsd.org 2019-09-06 01:58:50 +00:00 committed by Damien Miller
parent afdf27f5ac
commit 00865c2969
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kex.c
View File

@ -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;