aboutsummaryrefslogtreecommitdiff
path: root/sys/kern/kern_malloc.c
diff options
context:
space:
mode:
authorMatt Macy <mmacy@FreeBSD.org>2018-05-19 04:43:49 +0000
committerMatt Macy <mmacy@FreeBSD.org>2018-05-19 04:43:49 +0000
commit5072a5f46592e55ee0c9f05a463073e519a16331 (patch)
treebbdef1e2fb1679de31bdf17d24d93c83c586cdc3 /sys/kern/kern_malloc.c
parent5321c01b50a21cd699fbb0449a9c5215aa3167f2 (diff)
downloadsrc-5072a5f46592e55ee0c9f05a463073e519a16331.tar.gz
src-5072a5f46592e55ee0c9f05a463073e519a16331.zip
malloc: avoid possibly returning stack garbage if MALLOC_DEBUG is defined
Notes
Notes: svn path=/head/; revision=333847
Diffstat (limited to 'sys/kern/kern_malloc.c')
-rw-r--r--sys/kern/kern_malloc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index e6328039bced..93664e5476bb 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -559,6 +559,7 @@ malloc(size_t size, struct malloc_type *mtp, int flags)
#endif
#ifdef MALLOC_DEBUG
+ va = NULL;
if (malloc_dbg(&va, &size, mtp, flags) != 0)
return (va);
#endif
@@ -604,6 +605,7 @@ malloc_domain(size_t size, struct malloc_type *mtp, int domain,
#endif
#ifdef MALLOC_DEBUG
+ va = NULL;
if (malloc_dbg(&va, &size, mtp, flags) != 0)
return (va);
#endif