summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2020-12-17 23:10:27 +0000
committerdjm <djm@openbsd.org>2020-12-17 23:10:27 +0000
commit262b6e20c3cd3c2da4055c9276e76b45ae5cf19e (patch)
tree612c3675740bc0bdeb8291f3dbd1d237252f2362 /usr.bin/ssh/ssh.c
parentOnly enable the USB 3.0 port and PHY if it is enabled on a board. (diff)
downloadwireguard-openbsd-262b6e20c3cd3c2da4055c9276e76b45ae5cf19e.tar.xz
wireguard-openbsd-262b6e20c3cd3c2da4055c9276e76b45ae5cf19e.zip
prepare readconf.c for fuzzing; remove fatal calls and fix some
(one-off) memory leaks; ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
-rw-r--r--usr.bin/ssh/ssh.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 5bcb47444ea..13e378f7952 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.542 2020/11/12 22:38:57 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.543 2020/12/17 23:10:27 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1216,7 +1216,8 @@ main(int ac, char **av)
}
/* Fill configuration defaults. */
- fill_default_options(&options);
+ if (fill_default_options(&options) != 0)
+ cleanup_exit(255);
if (options.user == NULL)
options.user = xstrdup(pw->pw_name);