summaryrefslogtreecommitdiff
path: root/malloc/malloc.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-08-30 17:16:08 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-08-30 20:08:34 +0200
commita9da0bb2667ab20f1dbcd0a9ae6846db02fbc96a (patch)
tree9422f3ae82df4bef2ac63424b6f946be62e054d6 /malloc/malloc.c
parentac3ed168d0c0b2b702319ac0db72c9b475a8c72e (diff)
downloadglibc-a9da0bb2667ab20f1dbcd0a9ae6846db02fbc96a.tar.gz
malloc: Remove corrupt arena flag
This is no longer needed because we now abort immediately once heap corruption is detected.
Diffstat (limited to 'malloc/malloc.c')
-rw-r--r--malloc/malloc.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 9b80690215..65bbf02cb7 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1647,15 +1647,6 @@ typedef struct malloc_chunk *mfastbinptr;
#define set_noncontiguous(M) ((M)->flags |= NONCONTIGUOUS_BIT)
#define set_contiguous(M) ((M)->flags &= ~NONCONTIGUOUS_BIT)
-/* ARENA_CORRUPTION_BIT is set if a memory corruption was detected on the
- arena. Such an arena is no longer used to allocate chunks. Chunks
- allocated in that arena before detecting corruption are not freed. */
-
-#define ARENA_CORRUPTION_BIT (4U)
-
-#define arena_is_corrupt(A) (((A)->flags & ARENA_CORRUPTION_BIT))
-#define set_arena_corrupt(A) ((A)->flags |= ARENA_CORRUPTION_BIT)
-
/* Maximum size of memory handled in fastbins. */
static INTERNAL_SIZE_T global_max_fast;
@@ -4727,10 +4718,6 @@ _int_memalign (mstate av, size_t alignment, size_t bytes)
static int
mtrim (mstate av, size_t pad)
{
- /* Don't touch corrupt arenas. */
- if (arena_is_corrupt (av))
- return 0;
-
/* Ensure initialization/consolidation */
malloc_consolidate (av);