X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmalloc%2F__simple_malloc.c;h=c82939081ba480a21f20ca10d1c1c8dfc586b66d;hb=02084109f0f0d6e0a7fe4a8cb3a90a422725e264;hp=49b74c8e9cf44a3c1a1ebb575b87af4cd8fc7eea;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/malloc/__simple_malloc.c b/src/malloc/__simple_malloc.c
index 49b74c8e..c8293908 100644
--- a/src/malloc/__simple_malloc.c
+++ b/src/malloc/__simple_malloc.c
@@ -15,16 +15,17 @@ void *__simple_malloc(size_t n)
 	static int lock;
 	size_t align=1;
 
-	if (n < SIZE_MAX - ALIGN)
-		while (align<n && align<ALIGN)
-			align += align;
+	if (!n) n++;
+	if (n > SIZE_MAX/2) goto toobig;
+
+	while (align<n && align<ALIGN)
+		align += align;
 	n = n + align - 1 & -align;
 
 	LOCK(&lock);
 	if (!cur) cur = brk = __brk(0)+16;
-	if (n > SIZE_MAX - brk) goto fail;
-
 	base = cur + align-1 & -align;
+	if (n > SIZE_MAX - PAGE_SIZE - base) goto fail;
 	if (base+n > brk) {
 		new = base+n + PAGE_SIZE-1 & -PAGE_SIZE;
 		if (__brk(new) != new) goto fail;
@@ -37,6 +38,7 @@ void *__simple_malloc(size_t n)
 
 fail:
 	UNLOCK(&lock);
+toobig:
 	errno = ENOMEM;
 	return 0;
 }