diff options
| author |   tedu <tedu@openbsd.org> | 2015-12-30 06:01:18 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2015-12-30 06:01:18 +0000 |
| commit | 33f79db2ba8f20bb3ed2ffbf8272998d94990bb0 (patch) | |
| tree | 6cd2c842257a7995f11a663fc1faad71edc3f93f /lib/libc | |
| parent | regen (diff) | |
| download | wireguard-openbsd-33f79db2ba8f20bb3ed2ffbf8272998d94990bb0.tar.xz wireguard-openbsd-33f79db2ba8f20bb3ed2ffbf8272998d94990bb0.zip | |
if somebody makes the mistake of disabling abort, don't deref null in
validate_junk. from Michal Mazurek
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 36d2d717dbc..84d22507c0d 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.177 2015/12/09 02:45:23 tedu Exp $ */ +/* $OpenBSD: malloc.c,v 1.178 2015/12/30 06:01:18 tedu Exp $ */ /* * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net> * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> @@ -1225,8 +1225,10 @@ validate_junk(void *p) { if (p == NULL) return; r = find(pool, p); - if (r == NULL) + if (r == NULL) { wrterror("bogus pointer in validate_junk", p); + return; + } REALSIZE(sz, r); if (sz > 0 && sz <= MALLOC_MAXCHUNK) sz -= mopts.malloc_canaries; |