From eb145cfead123d7db17a10601867972363a8928d Mon Sep 17 00:00:00 2001
From: otto <>
Date: Sun, 13 Jul 2003 08:35:44 +0000
Subject: [PATCH] Fix two cases where malloc() returns NULL but does not set
 errno to ENOMEM. ok tdeval@ henning@ millert@

---
 src/lib/libc/stdlib/malloc.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index e1294732..3ce10785 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -8,7 +8,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: malloc.c,v 1.56 2003/05/14 17:46:39 tdeval Exp $";
+static char rcsid[] = "$OpenBSD: malloc.c,v 1.57 2003/07/13 08:35:44 otto Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -387,6 +387,7 @@ map_pages(pages)
 #ifdef MALLOC_EXTRA_SANITY
 	wrterror("(ES): overflow in map_pages fails\n");
 #endif /* MALLOC_EXTRA_SANITY */
+	errno = ENOMEM;
 	return (NULL);
     }
     tail = result + pages;
@@ -838,8 +839,10 @@ imalloc(size)
     if (suicide)
 	abort();
 
-    if ((size + malloc_pagesize) < size)       /* Check for overflow */
+    if ((size + malloc_pagesize) < size) {     /* Check for overflow */
 	result = NULL;
+	errno = ENOMEM;
+    }
     else if (size <= malloc_maxsize)
 	result =  malloc_bytes(size);
     else