diff options
| author | Petr Baudis <pasky@suse.cz> | 2010-02-24 15:44:29 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-02-24 15:44:29 -0800 |
| commit | 8c0b5f148eccd0a4d9714e72f50f13c586af59ec (patch) | |
| tree | 83d06ec998298747b7ce8e71919558161fc521ba | |
| parent | e2f4aa547a997922d960876671fb35ea101295f8 (diff) | |
| download | glibc-8c0b5f148eccd0a4d9714e72f50f13c586af59ec.tar.gz glibc-8c0b5f148eccd0a4d9714e72f50f13c586af59ec.tar.xz glibc-8c0b5f148eccd0a4d9714e72f50f13c586af59ec.zip | |
Fix assertion in palloc and pvalloc as well.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | malloc/malloc.c | 16 |
2 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index d541766e7e..5271d24ac5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-02-24 Ulrich Drepper <drepper@redhat.com> + + [BZ #5553] + * malloc/malloc.c (public_vALLOc): Set ar_ptr when trying main_arena. + (public_pVALLOc): Likewise. + 2010-02-22 Jim Meyering <meyering@redhat.com> * manual/math.texi (BSD Random): Fix a typo: s/are/is/ diff --git a/malloc/malloc.c b/malloc/malloc.c index b43e454f6e..9d60b7d173 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1,5 +1,5 @@ /* Malloc implementation for multiple threads without lock contention. - Copyright (C) 1996-2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1996-2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Wolfram Gloger <wg@malloc.de> and Doug Lea <dl@cs.oswego.edu>, 2001. @@ -3933,9 +3933,10 @@ public_vALLOc(size_t bytes) if(!p) { /* Maybe the failure is due to running out of mmapped areas. */ if(ar_ptr != &main_arena) { - (void)mutex_lock(&main_arena.mutex); - p = _int_memalign(&main_arena, pagesz, bytes); - (void)mutex_unlock(&main_arena.mutex); + ar_ptr = &main_arena; + (void)mutex_lock(&ar_ptr->mutex); + p = _int_memalign(&ar_ptr-> pagesz, bytes); + (void)mutex_unlock(&ar_ptr->mutex); } else { #if USE_ARENAS /* ... or sbrk() has failed and there is still a chance to mmap() */ @@ -3978,9 +3979,10 @@ public_pVALLOc(size_t bytes) if(!p) { /* Maybe the failure is due to running out of mmapped areas. */ if(ar_ptr != &main_arena) { - (void)mutex_lock(&main_arena.mutex); - p = _int_memalign(&main_arena, pagesz, rounded_bytes); - (void)mutex_unlock(&main_arena.mutex); + ar_ptr = &main_arena; + (void)mutex_lock(&ar_ptr->mutex); + p = _int_memalign(&ar_ptr-> pagesz, rounded_bytes); + (void)mutex_unlock(&ar_ptr->mutex); } else { #if USE_ARENAS /* ... or sbrk() has failed and there is still a chance to mmap() */ |