diff options
| -rw-r--r-- | libc/stdlib/malloc-standard/malloc.c | 5 | ||||
| -rw-r--r-- | libc/stdlib/malloc-standard/memalign.c | 2 | ||||
| -rw-r--r-- | libc/stdlib/malloc-standard/realloc.c | 2 | 
3 files changed, 5 insertions, 4 deletions
| diff --git a/libc/stdlib/malloc-standard/malloc.c b/libc/stdlib/malloc-standard/malloc.c index 2abb5bbdd..fd33b50c7 100644 --- a/libc/stdlib/malloc-standard/malloc.c +++ b/libc/stdlib/malloc-standard/malloc.c @@ -832,8 +832,6 @@ void* malloc(size_t bytes)      }  #endif -    __MALLOC_LOCK; -    av = get_malloc_state();      /*         Convert request size to internal form by adding (sizeof(size_t)) bytes         overhead plus possibly more to obtain necessary alignment and/or @@ -845,6 +843,9 @@ void* malloc(size_t bytes)      checked_request2size(bytes, nb); +    __MALLOC_LOCK; +    av = get_malloc_state(); +      /*         Bypass search if no frees yet         */ diff --git a/libc/stdlib/malloc-standard/memalign.c b/libc/stdlib/malloc-standard/memalign.c index 6303c1dd9..e9ae5a7b9 100644 --- a/libc/stdlib/malloc-standard/memalign.c +++ b/libc/stdlib/malloc-standard/memalign.c @@ -52,8 +52,8 @@ void* memalign(size_t alignment, size_t bytes)  	alignment = a;      } -    __MALLOC_LOCK;      checked_request2size(bytes, nb); +    __MALLOC_LOCK;      /* Strategy: find a spot within that chunk that meets the alignment       * request, and then possibly free the leading and trailing space.  */ diff --git a/libc/stdlib/malloc-standard/realloc.c b/libc/stdlib/malloc-standard/realloc.c index e060b70ea..e49d11125 100644 --- a/libc/stdlib/malloc-standard/realloc.c +++ b/libc/stdlib/malloc-standard/realloc.c @@ -54,9 +54,9 @@ void* realloc(void* oldmem, size_t bytes)  	return NULL;      } +    checked_request2size(bytes, nb);      __MALLOC_LOCK;      av = get_malloc_state(); -    checked_request2size(bytes, nb);      oldp    = mem2chunk(oldmem);      oldsize = chunksize(oldp); | 
