d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't pass NULL pointer to memset if we are compiled with DIAGNOSTIC

Browse Source 
Approved by:	re/rwatson
This commit is contained in:
Poul-Henning Kamp 2003-05-12 05:09:56 +00:00
parent 3d5371a1a6
commit 1282e9acea
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=114935
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/kern/kern_malloc.c
View File

@ -250,13 +250,12 @@ malloc(size, type, flags)
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