aboutsummaryrefslogtreecommitdiffstats
path: root/malloc
diff options
context:
space:
mode:
authorIstvan Kurucsai <pistukem@gmail.com>2018-01-12 15:26:20 +0100
committerFlorian Weimer <fweimer@redhat.com>2018-01-12 15:26:20 +0100
commit249a5895f120b13290a372a49bb4b499e749806f (patch)
tree5112f07eaffc8203361ff59ab4bd941bd59aa91c /malloc
parent1a51e46e4a87e1cd9528ac5e5656011636e4086b (diff)
downloadtermbaud-249a5895f120b13290a372a49bb4b499e749806f.tar.gz
termbaud-249a5895f120b13290a372a49bb4b499e749806f.tar.xz
termbaud-249a5895f120b13290a372a49bb4b499e749806f.zip
malloc: Ensure that the consolidated fast chunk has a sane size.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/malloc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 48106f9bd45..f5aafd2c051 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;