diff options
| author |   otto <otto@openbsd.org> | 2016-01-26 15:44:28 +0000 |
|---|---|---|
| committer | otto <otto@openbsd.org> | 2016-01-26 15:44:28 +0000 |
| commit | 88b52191ebeabe5e72e8c1007a2c1f5162a82979 (patch) | |
| tree | c31ca4a9567c3f1d3cafd511680022df8b2edee2 /lib/libc/stdlib/malloc.c | |
| parent | Add a grant table reference invalidation spin out check (diff) | |
| download | wireguard-openbsd-88b52191ebeabe5e72e8c1007a2c1f5162a82979.tar.xz wireguard-openbsd-88b52191ebeabe5e72e8c1007a2c1f5162a82979.zip | |
Don't crash dumping malloc stats if malloc_init hasn't been called, noted by
David CARLIER
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 23e076bdafe..e8e55c079eb 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.180 2016/01/06 17:57:22 tedu Exp $ */ +/* $OpenBSD: malloc.c,v 1.181 2016/01/26 15:44:28 otto Exp $ */ /* * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net> * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> @@ -1910,6 +1910,8 @@ malloc_dump(int fd) struct region_info *r; int saved_errno = errno; + if (pool == NULL) + return; for (i = 0; i < MALLOC_DELAYED_CHUNK_MASK + 1; i++) { p = pool->delayed_chunks[i]; if (p == NULL) |