diff options
| author | phk <phk@FreeBSD.org> | 2003-05-12 05:09:56 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-05-12 05:09:56 +0000 |
| commit | 587d476cf93e1869f683313600dfdf4a01f55445 (patch) | |
| tree | f736ef4a594e2e1879a5a2b7318838c9d61b00c3 /sys/kern/kern_malloc.c | |
| parent | 154b84916c1e53b7d502fae05586c745c870e8d1 (diff) | |
| download | FreeBSD-src-587d476cf93e1869f683313600dfdf4a01f55445.zip FreeBSD-src-587d476cf93e1869f683313600dfdf4a01f55445.tar.gz | |
Don't pass NULL pointer to memset if we are compiled with DIAGNOSTIC
Approved by: re/rwatson
Diffstat (limited to 'sys/kern/kern_malloc.c')
| -rw-r--r-- | sys/kern/kern_malloc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 7dd4726..dc83772 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -250,13 +250,12 @@ out: ksp->ks_maxused = ksp->ks_memuse; mtx_unlock(&ksp->ks_mtx); - if (!(flags & M_NOWAIT)) + if (flags & M_WAITOK) KASSERT(va != NULL, ("malloc(M_WAITOK) returned NULL")); - if (va == NULL) { + else if (va == NULL) t_malloc_fail = time_uptime; - } #ifdef DIAGNOSTIC - if (!(flags & M_ZERO)) { + if (va != NULL && !(flags & M_ZERO)) { memset(va, 0x70, osize); } #endif |
