From 19892bf0a740062cf51b84c27f53f7c0f3120b53 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 22 May 2011 12:34:33 -0400 Subject: [PATCH] fix brk/sbrk behavior to match the real legacy functions --- src/linux/brk.c | 2 +- src/linux/sbrk.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/linux/brk.c b/src/linux/brk.c index 9f63c5a8..d91ee5a9 100644 --- a/src/linux/brk.c +++ b/src/linux/brk.c @@ -2,5 +2,5 @@ int brk(void *end) { - return -(syscall(SYS_brk, end) == -1); + return -(syscall(SYS_brk, end) != (unsigned long)end); } diff --git a/src/linux/sbrk.c b/src/linux/sbrk.c index b2943a92..5fab74be 100644 --- a/src/linux/sbrk.c +++ b/src/linux/sbrk.c @@ -3,5 +3,7 @@ void *sbrk(ptrdiff_t inc) { - return (void *)syscall(SYS_brk, syscall(SYS_brk, 0)+inc); + unsigned long cur = syscall(SYS_brk, 0); + if (inc && syscall(SYS_brk, cur+inc) != cur+inc) return (void *)-1; + return (void *)cur; }