From c3b9ef8dfc83e9d17da5adc73709d2f7dfbbaf13 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Mon, 24 Aug 2015 14:33:07 +0530 Subject: Don't use the main arena in retry path if it is corrupt If allocation on a non-main arena fails, the main arena is used without checking to see if it is corrupt. Add a check that avoids the main arena if it is corrupt. * malloc/arena.c (arena_get_retry): Don't use main_arena if it is corrupt. --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 1b5b03e666..dae71cecec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-08-24 Siddhesh Poyarekar + * malloc/arena.c (arena_get_retry): Don't use main_arena if it + is corrupt. + * malloc/arena.c (arena_get2): Drop unused argument. (arena_lock): Adjust. (arena_get_retry): Likewise. -- cgit v1.2.3