Merge pull request #60 from telemenar/dev

Fix a crashing case where arena_chunk_init_hard returns NULL.
This commit is contained in:
Jason Evans 2014-03-27 21:45:03 -07:00
commit 67fd1e0700

View File

@ -614,8 +614,11 @@ arena_chunk_alloc(arena_t *arena)
if (arena->spare != NULL) if (arena->spare != NULL)
chunk = arena_chunk_init_spare(arena); chunk = arena_chunk_init_spare(arena);
else else {
chunk = arena_chunk_init_hard(arena); chunk = arena_chunk_init_hard(arena);
if (chunk == NULL)
return (NULL);
}
/* Insert the run into the runs_avail tree. */ /* Insert the run into the runs_avail tree. */
arena_avail_insert(arena, chunk, map_bias, chunk_npages-map_bias, arena_avail_insert(arena, chunk, map_bias, chunk_npages-map_bias,