diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-03-29 04:50:56 -0500 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-03-29 04:50:56 -0500 |
| commit | cd5f92704e1e17bbc0c15d197f3bc236c7dc9bf2 (patch) | |
| tree | 1400302b543e4528aedea5d72731983559cfcf36 /libc/stdlib/malloc-standard/malloc.c | |
| parent | ad2bffbf1926051ef333f9899344f6bddf2c03cf (diff) | |
| parent | 24946289317ea23bb0d1814cca0a499a905f7d6f (diff) | |
merge uClibc git master
Diffstat (limited to 'libc/stdlib/malloc-standard/malloc.c')
| -rw-r--r-- | libc/stdlib/malloc-standard/malloc.c | 5 |
1 files changed, 3 insertions, 2 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 */ |