diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-12-18 00:10:27 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-12-21 00:52:22 +0100 |
| commit | 43026da035cd266db37df1f723d5575056150744 (patch) | |
| tree | 9d0d841461ff8a34abec7e8fd88e8aa708080ab7 /ssh.c | |
| parent | upstream: use _PATH_SSH_USER_DIR instead of hardcoded .ssh in path (diff) | |
| download | openssh-43026da035cd266db37df1f723d5575056150744.tar.xz openssh-43026da035cd266db37df1f723d5575056150744.zip | |
upstream: prepare readconf.c for fuzzing; remove fatal calls and
fix some (one-off) memory leaks; ok markus@
OpenBSD-Commit-ID: 91c6aec57b0e7aae9190de188e9fe8933aad5ec5
Diffstat (limited to '')
| -rw-r--r-- | ssh.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 @@ -1237,7 +1237,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); |