summaryrefslogtreecommitdiffstats
path: root/lib/libc/stdlib/malloc.c
diff options
context:
space:
mode:
authorotto <otto@openbsd.org>2016-07-06 20:32:02 +0000
committerotto <otto@openbsd.org>2016-07-06 20:32:02 +0000
commita6f029b1724cc6d4b09c7b9306f7cc71949c2836 (patch)
treed890f54be84480cc82fa63c2287022f60389ccc8 /lib/libc/stdlib/malloc.c
parentAllow space-deliminated fields in syslog.conf in addition to (diff)
downloadwireguard-openbsd-a6f029b1724cc6d4b09c7b9306f7cc71949c2836.tar.xz
wireguard-openbsd-a6f029b1724cc6d4b09c7b9306f7cc71949c2836.zip
J/j is a three valued option, document and fix code to actuall support that
with a little help from jmc@ for the man page bits ok jca@ and a reluctant tedu@
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
-rw-r--r--lib/libc/stdlib/malloc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 678c782d200..b4c0010f357 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: malloc.c,v 1.191 2016/06/30 09:00:48 otto Exp $ */
+/* $OpenBSD: malloc.c,v 1.192 2016/07/06 20:32:02 otto Exp $ */
/*
* Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net>
* Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -533,10 +533,12 @@ omalloc_parseopt(char opt)
mopts.malloc_hint = 1;
break;
case 'j':
- mopts.malloc_junk = 0;
+ if (mopts.malloc_junk > 0)
+ mopts.malloc_junk--;
break;
case 'J':
- mopts.malloc_junk = 2;
+ if (mopts.malloc_junk < 2)
+ mopts.malloc_junk++;
break;
case 'n':
case 'N':