diff options
author | otto@openbsd.org <otto@openbsd.org> | 2019-06-06 05:13:13 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2019-06-08 00:25:42 +1000 |
commit | 0323d9b619d512f80c57575b810a05791891f657 (patch) | |
tree | 6bde14513c6fe9ff37d069325ee6baac112b6b60 /sftp.c | |
parent | c586d2d3129265ea64b12960c379d634bccb6535 (diff) |
upstream: Replace calls to ssh_malloc_init() by a static init of
malloc_options. Prepares for changes in the way malloc is initialized. ok
guenther@ dtucker@
OpenBSD-Commit-ID: 154f4e3e174f614b09f792d4d06575e08de58a6b
Diffstat (limited to 'sftp.c')
-rw-r--r-- | sftp.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.190 2019/01/21 22:50:42 tb Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.191 2019/06/06 05:13:13 otto Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -2388,7 +2388,6 @@ main(int argc, char **argv) | |||
2388 | size_t num_requests = DEFAULT_NUM_REQUESTS; | 2388 | size_t num_requests = DEFAULT_NUM_REQUESTS; |
2389 | long long limit_kbps = 0; | 2389 | long long limit_kbps = 0; |
2390 | 2390 | ||
2391 | ssh_malloc_init(); /* must be called before any mallocs */ | ||
2392 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ | 2391 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
2393 | sanitise_stdfd(); | 2392 | sanitise_stdfd(); |
2394 | msetlocale(); | 2393 | msetlocale(); |