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.26.9000-1118-g249a589
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 Jan 2018 14:44:39 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26.9000-1118-g249a589
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 249a5895f120b13290a372a49bb4b499e749806f (commit)
from 1a51e46e4a87e1cd9528ac5e5656011636e4086b (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=249a5895f120b13290a372a49bb4b499e749806f
commit 249a5895f120b13290a372a49bb4b499e749806f
Author: Istvan Kurucsai <pistukem@gmail.com>
Date: Fri Jan 12 15:26:20 2018 +0100
malloc: Ensure that the consolidated fast chunk has a sane size.
diff --git a/ChangeLog b/ChangeLog
index 72aaf78..fb280c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-12 Istvan Kurucsai <pistukem@gmail.com>
+
+ * malloc/malloc.c (malloc_consolidate): Add size check.
+
2018-01-12 Florian Weimer <fweimer@redhat.com>
* support/write_message.c (write_message): Preserve errno.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 48106f9..f5aafd2 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4431,6 +4431,12 @@ static void malloc_consolidate(mstate av)
p = atomic_exchange_acq (fb, NULL);
if (p != 0) {
do {
+ {
+ unsigned int idx = fastbin_index (chunksize (p));
+ if ((&fastbin (av, idx)) != fb)
+ malloc_printerr ("malloc_consolidate(): invalid chunk size");
+ }
+
check_inuse_chunk(av, p);
nextp = p->fd;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
malloc/malloc.c | 6 ++++++
2 files changed, 10 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources