This is the mail archive of the mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.19-604-g51a7380

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  51a7380b8968251a49a4c5b0bc7ed1af5b0512c6 (commit)
      from  91b84fe588238289e734ee05cfff26482c8f56ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------;a=commitdiff;h=51a7380b8968251a49a4c5b0bc7ed1af5b0512c6

commit 51a7380b8968251a49a4c5b0bc7ed1af5b0512c6
Author: Will Newton <>
Date:   Fri Jun 13 16:37:12 2014 +0100

    malloc/malloc.c: Avoid calling sbrk unnecessarily with zero
    Due to my bad review suggestion for the fix for BZ #15089 a check
    was removed from systrim to prevent sbrk being called with a zero
    argument. Add the check back to avoid this useless work.
    2014-06-19  Will Newton  <>
    	* malloc/malloc.c (systrim): If extra is zero then return

diff --git a/ChangeLog b/ChangeLog
index 2a11522..ea0c48f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-19  Will Newton  <>
+	* malloc/malloc.c (systrim): If extra is zero then return
+	early.
 2014-06-19  Siddhesh Poyarekar  <>
 	* benchtests/Makefile ($(objpfx)bench-%.c): Remove $(.).
diff --git a/malloc/malloc.c b/malloc/malloc.c
index d8fd8b4..41fd76a 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -2749,6 +2749,9 @@ systrim (size_t pad, mstate av)
   /* Release in pagesize units, keeping at least one page */
   extra = (top_area - pad) & ~(pagesz - 1);
+  if (extra == 0)
+    return 0;
      Only proceed if end of memory is where we last set it.
      This avoids problems if there were foreign sbrk calls.


Summary of changes:
 ChangeLog       |    5 +++++
 malloc/malloc.c |    3 +++
 2 files changed, 8 insertions(+), 0 deletions(-)

GNU C Library master sources

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]