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 /sftp-server.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 'sftp-server.c')
| -rw-r--r-- | sftp-server.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sftp-server.c b/sftp-server.c index 79ef45b1..e11a1b89 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-server.c,v 1.108 2015/11/16 06:13:04 logan Exp $ */ +/* $OpenBSD: sftp-server.c,v 1.109 2016/02/15 09:47:49 dtucker Exp $ */ /* * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * @@ -1513,6 +1513,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) extern char *optarg; extern char *__progname; + ssh_malloc_init(); /* must be called before any mallocs */ __progname = ssh_get_progname(argv[0]); log_init(__progname, log_level, log_facility, log_stderr); |