diff options
| author |   tedu <tedu@openbsd.org> | 2019-05-15 21:25:50 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2019-05-15 21:25:50 +0000 |
| commit | d3ca61021b64d604115fd4a68460452e144a6e49 (patch) | |
| tree | c934b014e25d0ef73ee0aefd08d0f6b955f69124 /sys/kern/kern_malloc.c | |
| parent | revert previous, since it makes jmc's machine print an extra newline. (diff) | |
| download | wireguard-openbsd-d3ca61021b64d604115fd4a68460452e144a6e49.tar.xz wireguard-openbsd-d3ca61021b64d604115fd4a68460452e144a6e49.zip | |
rework the zero warning slightly, and more completely disable until we're
more ready to deal with the noise.
Diffstat (limited to 'sys/kern/kern_malloc.c')
| -rw-r--r-- | sys/kern/kern_malloc.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index c5e19c2c015..41ca06857ea 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.138 2019/05/09 14:09:01 tedu Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.139 2019/05/15 21:25:50 tedu Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -375,7 +375,6 @@ free(void *addr, int type, size_t freedsize) int s; #ifdef DIAGNOSTIC long alloc; - static int zerowarnings; #endif #ifdef KMEMSTATS struct kmemstats *ksp = &kmemstats[type]; @@ -398,15 +397,17 @@ free(void *addr, int type, size_t freedsize) if (size > MAXALLOCSAVE) size = kup->ku_pagecnt << PAGE_SHIFT; #ifdef DIAGNOSTIC - if (freedsize == 0 && zerowarnings < 5) { - zerowarnings++; - printf("free with zero size: (%d)\n", type); -#ifdef DDB #if 0 - db_stack_dump(); -#endif + if (freedsize == 0) { + static int zerowarnings; + if (zerowarnings < 5) { + zerowarnings++; + printf("free with zero size: (%d)\n", type); +#ifdef DDB + db_stack_dump(); #endif } +#endif if (freedsize != 0 && freedsize > size) panic("free: size too large %zu > %ld (%p) type %s", freedsize, size, addr, memname[type]); |