]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Base max_fast on alignment, not width, of bins (Bug 24903)
authorDJ Delorie <dj@redhat.com>
Wed, 30 Oct 2019 22:03:14 +0000 (18:03 -0400)
committerArjun Shankar <ashankar@redhat.com>
Tue, 19 Nov 2019 11:27:04 +0000 (12:27 +0100)
set_max_fast sets the "impossibly small" value based on,
eventually, MALLOC_ALIGNMENT.  The comparisons for the smallest
chunk used is, eventually, MIN_CHUNK_SIZE.  Note that i386
is the only platform where these are the same, so a smallest
chunk *would* be put in a no-fastbins fastbin.

This change calculates the "impossibly small" value
based on MIN_CHUNK_SIZE instead, so that we can know it will
always be impossibly small.

(cherry picked from commit ff12e0fb91b9072800f031cb21fb2651ee7b6251)

malloc/malloc.c

index fe973770a6eb661e0e2d901ba311fed85a5b3340..8c68b21b2be16a088b0cf669fd1441ff98e4f178 100644 (file)
@@ -1621,7 +1621,7 @@ static INTERNAL_SIZE_T global_max_fast;
 
 #define set_max_fast(s) \
   global_max_fast = (((s) == 0)                                                      \
-                     ? SMALLBIN_WIDTH : ((s + SIZE_SZ) & ~MALLOC_ALIGN_MASK))
+                     ? MIN_CHUNK_SIZE / 2 : ((s + SIZE_SZ) & ~MALLOC_ALIGN_MASK))
 
 static inline INTERNAL_SIZE_T
 get_max_fast (void)