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-add.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-add.c')
| -rw-r--r-- | ssh-add.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-add.c,v 1.127 2015/12/11 02:31:47 mmcc Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.128 2016/02/15 09:47:49 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -481,6 +481,7 @@ main(int argc, char **argv) int r, i, ch, deleting = 0, ret = 0, key_only = 0; int xflag = 0, lflag = 0, Dflag = 0; + ssh_malloc_init(); /* must be called before any mallocs */ /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ sanitise_stdfd(); |