diff options
author | Darren Tucker <dtucker@cvs.openbsd.org> | 2016-02-15 09:47:50 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2016-02-15 09:47:50 +0000 |
commit | 98fba69e0d9a5b781f4a2e0f863bc85c2c46248f (patch) | |
tree | 1bb383438e25f0e0d3425d372ea5782082901db2 /usr.bin/ssh/ssh-keyscan.c | |
parent | 0f6af553e94b205cddf287a90d4fac6b885e5ec4 (diff) |
Add a function to enable security-related malloc_options. With and ok
deraadt@, something similar has been in the snaps for a while.
Diffstat (limited to 'usr.bin/ssh/ssh-keyscan.c')
-rw-r--r-- | usr.bin/ssh/ssh-keyscan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index 570b34dd744..81c47110190 100644 --- a/usr.bin/ssh/ssh-keyscan.c +++ b/usr.bin/ssh/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.104 2015/11/08 23:24:03 jmc Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.105 2016/02/15 09:47:49 dtucker Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -676,6 +676,7 @@ main(int argc, char **argv) extern int optind; extern char *optarg; + ssh_malloc_init(); /* must be called before any mallocs */ TAILQ_INIT(&tq); /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |