Merge pull request #60 from telemenar/dev

Fix a crashing case where arena_chunk_init_hard returns NULL.
2014-03-27 21:45:03 -07:00 · 2014-03-27 21:45:03 -07:00 · 67fd1e0700
commit 67fd1e0700
parent 9e20df163c 20a8c78bfe
1 changed files with 4 additions and 1 deletions
--- 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,