summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorotto <>2006-12-19 13:00:50 +0000
committerotto <>2006-12-19 13:00:50 +0000
commitc637dfc67372c7d04a8e0cc2bca4a0f242573541 (patch)
tree0a13a4154516eb1bf4deb745e723202194359296
parent96acb90323dc96ef02d2970dc81f29385d134c85 (diff)
downloadopenbsd-c637dfc67372c7d04a8e0cc2bca4a0f242573541.tar.gz
openbsd-c637dfc67372c7d04a8e0cc2bca4a0f242573541.tar.bz2
openbsd-c637dfc67372c7d04a8e0cc2bca4a0f242573541.zip
a failed mmap returns MAP_FAILED, not NULL. found while exercising pax
in low-mem conditions; ok dim@
-rw-r--r--src/lib/libc/stdlib/malloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index ace34c96f6..39951bc904 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.84 2006/10/24 04:35:30 tedu Exp $ */ 1/* $OpenBSD: malloc.c,v 1.85 2006/12/19 13:00:50 otto Exp $ */
2 2
3/* 3/*
4 * ---------------------------------------------------------------------------- 4 * ----------------------------------------------------------------------------
@@ -267,7 +267,7 @@ alloc_pgfree()
267 267
268 if (pgfree_list == NULL) { 268 if (pgfree_list == NULL) {
269 p = MMAP(malloc_pagesize); 269 p = MMAP(malloc_pagesize);
270 if (!p) 270 if (p == MAP_FAILED)
271 return NULL; 271 return NULL;
272 for (i = 0; i < malloc_pagesize / sizeof(*p); i++) { 272 for (i = 0; i < malloc_pagesize / sizeof(*p); i++) {
273 p[i].next = pgfree_list; 273 p[i].next = pgfree_list;
@@ -288,7 +288,7 @@ alloc_pginfo()
288 288
289 if (pginfo_list == NULL) { 289 if (pginfo_list == NULL) {
290 p = MMAP(malloc_pagesize); 290 p = MMAP(malloc_pagesize);
291 if (!p) 291 if (p == MAP_FAILED)
292 return NULL; 292 return NULL;
293 for (i = 0; i < malloc_pagesize / sizeof(*p); i++) { 293 for (i = 0; i < malloc_pagesize / sizeof(*p); i++) {
294 p[i].next = pginfo_list; 294 p[i].next = pginfo_list;