X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=kernel%2Flib%2Flibc.cc;fp=kernel%2Flib%2Flibc.cc;h=8d9685a5a309eebc23b27d4d0c1c38cd0983df9d;hp=6518988b7b2538fe3acb510fa711f608dfabc2ed;hb=371d6008c5366f424e4bf8889febe3cc495d0d3e;hpb=ed94ee97c9872c957efa4790c4ea073f371262a6

diff --git a/kernel/lib/libc.cc b/kernel/lib/libc.cc
index 6518988..8d9685a 100644
--- a/kernel/lib/libc.cc
+++ b/kernel/lib/libc.cc
@@ -34,7 +34,8 @@ void bzero(void *b, size_t len)
 
 void *malloc(size_t len)
 {
-	assert(len <= Arch::page_size - sizeof(size_t));
+	if (len > Arch::page_size - sizeof(size_t))
+		return NULL;
 
 	len = (len + sizeof(size_t) + Arch::page_size - 1) / Arch::page_size;
 	Mem::Page *page = Mem::PageAlloc::alloc(len);