diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-02-15 09:47:49 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-02-16 10:44:00 +1100 |
| commit | ffb1e7e896139a42ceb78676f637658f44612411 (patch) | |
| tree | aba9407fda7b5ee62e4562c79886450f7125f593 /ssh-keyscan.c | |
| parent | ef39e8c0497ff0564990a4f9e8b7338b3ba3507c (diff) | |
| download | openssh-git-ffb1e7e896139a42ceb78676f637658f44612411.tar.gz | |
upstream commit
Add a function to enable security-related malloc_options.
With and ok deraadt@, something similar has been in the snaps for a while.
Upstream-ID: 43a95523b832b7f3b943d2908662191110c380ed
Diffstat (limited to 'ssh-keyscan.c')
| -rw-r--r-- | ssh-keyscan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index a23276f5..7fe61e4e 100644 --- a/ssh-keyscan.c +++ b/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>. * @@ -696,6 +696,7 @@ main(int argc, char **argv) extern int optind; extern char *optarg; + ssh_malloc_init(); /* must be called before any mallocs */ __progname = ssh_get_progname(argv[0]); seed_rng(); TAILQ_INIT(&tq); |