diff options
| author | otto <> | 2016-01-26 15:44:28 +0000 |
|---|---|---|
| committer | otto <> | 2016-01-26 15:44:28 +0000 |
| commit | 6b9957aa227d3313810d2bc799fdafb875676abb (patch) | |
| tree | e35f3b14af09a278936a35f07d1508969dd7c314 /src/lib/libc | |
| parent | fa928897a647079070fabeb224bd9500f1d8d4fc (diff) | |
| download | openbsd-6b9957aa227d3313810d2bc799fdafb875676abb.tar.gz openbsd-6b9957aa227d3313810d2bc799fdafb875676abb.tar.bz2 openbsd-6b9957aa227d3313810d2bc799fdafb875676abb.zip | |
Don't crash dumping malloc stats if malloc_init hasn't been called, noted by
David CARLIER
Diffstat (limited to 'src/lib/libc')
| -rw-r--r-- | src/lib/libc/stdlib/malloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index 23e076bdaf..e8e55c079e 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: malloc.c,v 1.180 2016/01/06 17:57:22 tedu Exp $ */ | 1 | /* $OpenBSD: malloc.c,v 1.181 2016/01/26 15:44:28 otto Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net> | 3 | * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net> |
| 4 | * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> | 4 | * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> |
| @@ -1910,6 +1910,8 @@ malloc_dump(int fd) | |||
| 1910 | struct region_info *r; | 1910 | struct region_info *r; |
| 1911 | int saved_errno = errno; | 1911 | int saved_errno = errno; |
| 1912 | 1912 | ||
| 1913 | if (pool == NULL) | ||
| 1914 | return; | ||
| 1913 | for (i = 0; i < MALLOC_DELAYED_CHUNK_MASK + 1; i++) { | 1915 | for (i = 0; i < MALLOC_DELAYED_CHUNK_MASK + 1; i++) { |
| 1914 | p = pool->delayed_chunks[i]; | 1916 | p = pool->delayed_chunks[i]; |
| 1915 | if (p == NULL) | 1917 | if (p == NULL) |