diff options
| author | des <des@FreeBSD.org> | 2016-03-11 00:15:29 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-03-11 00:15:29 +0000 |
| commit | bb6f58c772c321121b8148fe7726de90f90e1dec (patch) | |
| tree | 755a41a3dcaa10393f1e0d17469bd517b8a0989a /crypto/openssh/xmalloc.c | |
| parent | 0e0b4ac1f05aada737d7d2280ab40c6b06016981 (diff) | |
| parent | 9169dee5c46ff1d9dfce5c97590347e20a54c84e (diff) | |
| download | FreeBSD-src-bb6f58c772c321121b8148fe7726de90f90e1dec.zip FreeBSD-src-bb6f58c772c321121b8148fe7726de90f90e1dec.tar.gz | |
Upgrade to OpenSSH 7.2p2.
Diffstat (limited to 'crypto/openssh/xmalloc.c')
| -rw-r--r-- | crypto/openssh/xmalloc.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/crypto/openssh/xmalloc.c b/crypto/openssh/xmalloc.c index 98cbf87..b583236 100644 --- a/crypto/openssh/xmalloc.c +++ b/crypto/openssh/xmalloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xmalloc.c,v 1.32 2015/04/24 01:36:01 deraadt Exp $ */ +/* $OpenBSD: xmalloc.c,v 1.33 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 @@ -26,6 +26,16 @@ #include "xmalloc.h" #include "log.h" +void +ssh_malloc_init(void) +{ +#if defined(__OpenBSD__) + extern char *malloc_options; + + malloc_options = "S"; +#endif /* __OpenBSD__ */ +} + void * xmalloc(size_t size) { |
