From 00865c29690003b4523cc09a0e104724b9f911a4 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Fri, 6 Sep 2019 01:58:50 +0000 Subject: upstream: better error code for bad arguments; inspired by OpenBSD-Commit-ID: dfc263b6041de7f0ed921a1de0b81ddebfab1e0a --- kex.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'kex.c') diff --git a/kex.c b/kex.c index 1eb27264a..84f8e2aa9 100644 --- a/kex.c +++ b/kex.c @@ -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; -- cgit v1.2.3