diff options
| author | Jason Evans <jasone@canonware.com> | 2014-03-31 16:33:19 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2014-03-31 16:33:19 (GMT) |
| commit | 46c0af68bd248b04df75e4f92d5fb804c3d75340 (patch) | |
| tree | 28a1ac21474d5f3d55812986c4c75a8bb734257b /src/arena.c | |
| parent | 7709a64c59daf0b1f938be49472fcc499e1bd136 (diff) | |
| parent | 8a26eaca7f4c95771ecbf096caeeba14fbe1122f (diff) | |
| download | jemalloc-3.6.0.zip jemalloc-3.6.0.tar.gz jemalloc-3.6.0.tar.bz2 | |
Merge branch 'dev'3.6.0
Diffstat (limited to 'src/arena.c')
| -rw-r--r-- | src/arena.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/arena.c b/src/arena.c index 390ab0f..dad707b 100644 --- a/src/arena.c +++ b/src/arena.c @@ -614,8 +614,11 @@ arena_chunk_alloc(arena_t *arena) if (arena->spare != NULL) chunk = arena_chunk_init_spare(arena); - else + else { chunk = arena_chunk_init_hard(arena); + if (chunk == NULL) + return (NULL); + } /* Insert the run into the runs_avail tree. */ arena_avail_insert(arena, chunk, map_bias, chunk_npages-map_bias, |