diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | malloc/arena.c | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 437fb6d24e..e418cc0897 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-06-21 Florian Weimer <fweimer@redhat.com> + + [BZ #20284] + * malloc/arena.c (reused_arena): Do not return NULL if we start + out with a non-corrupted arena. + 2016-06-21 Adhemerval Zanella <adhemerval.zanella@linaro.org> * misc/Makefile (tests): Add tst-preadvwritev and tst-preadvwritev64. diff --git a/malloc/arena.c b/malloc/arena.c index ed5a4d5cd3..229783f3b7 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -771,14 +771,12 @@ reused_arena (mstate avoid_arena) { result = result->next; if (result == begin) - break; + /* We looped around the arena list. We could not find any + arena that was either not corrupted or not the one we + wanted to avoid. */ + return NULL; } - /* We could not find any arena that was either not corrupted or not the one - we wanted to avoid. */ - if (result == begin || result == avoid_arena) - return NULL; - /* No arena available without contention. Wait for the next in line. */ LIBC_PROBE (memory_arena_reuse_wait, 3, &result->mutex, result, avoid_arena); (void) mutex_lock (&result->mutex); |