This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.12-201-gfdc0f37
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 Oct 2010 02:37:24 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.12-201-gfdc0f37
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 fdc0f374bcd2d0513569aa8d600f960e43e8af1d (commit)
from d0b9e94faf18f2585e7d0ae0b10daefb12f93059 (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 -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fdc0f374bcd2d0513569aa8d600f960e43e8af1d
commit fdc0f374bcd2d0513569aa8d600f960e43e8af1d
Author: Ulrich Drepper <drepper@redhat.com>
Date: Sun Oct 24 22:37:00 2010 -0400
Fix perturbing in malloc on free.
diff --git a/ChangeLog b/ChangeLog
index 3f6dd1a..a363552 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-24 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #12140]
+ * malloc/malloc.c (_int_free): Fill correct number of bytes when
+ perturbing.
+
2010-10-20 Michael B. Brutman <brutman@us.ibm.com>
* sysdeps/powerpc/dl-procinfo.c: Add support for ppca2 platform
diff --git a/NEWS b/NEWS
index 48efcbd..23f1e2d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes. 2010-10-13
+GNU C Library NEWS -- history of user-visible changes. 2010-10-24
Copyright (C) 1992-2009, 2010 Free Software Foundation, Inc.
See the end for copying conditions.
@@ -11,7 +11,7 @@ Version 2.13
3268, 7066, 10851, 11611, 11640, 11701, 11840, 11856, 11883, 11903, 11904,
11968, 11979, 12005, 12037, 12067, 12077, 12078, 12092, 12093, 12107, 12108,
- 12113
+ 12113, 12140
* New Linux interfaces: prlimit, prlimit64, fanotify_init, fanotify_mark
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 53ee1cc..f7770a3 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4850,7 +4850,7 @@ _int_free(mstate av, mchunkptr p)
}
if (__builtin_expect (perturb_byte, 0))
- free_perturb (chunk2mem(p), size - SIZE_SZ);
+ free_perturb (chunk2mem(p), size - 2 * SIZE_SZ);
set_fastchunks(av);
unsigned int idx = fastbin_index(size);
@@ -4954,7 +4954,7 @@ _int_free(mstate av, mchunkptr p)
}
if (__builtin_expect (perturb_byte, 0))
- free_perturb (chunk2mem(p), size - SIZE_SZ);
+ free_perturb (chunk2mem(p), size - 2 * SIZE_SZ);
/* consolidate backward */
if (!prev_inuse(p)) {
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
NEWS | 4 ++--
malloc/malloc.c | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources