From e310717c85410af6caa29b7819c8c988cc149eb6 Mon Sep 17 00:00:00 2001 From: Chris Hall Date: Wed, 28 Apr 2010 18:51:53 +0100 Subject: Trap NULL returns from calloc() in mem_tracker The lib/mem_tracker.c allocates memory for its tracking tables, and now checks that has not run out of memory -- so that stops immediately rather than shortly after in an odd way. --- lib/mem_tracker.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/mem_tracker.c') diff --git a/lib/mem_tracker.c b/lib/mem_tracker.c index fa967476..b468ad2a 100644 --- a/lib/mem_tracker.c +++ b/lib/mem_tracker.c @@ -162,6 +162,8 @@ mem_md_make_bases(void) mem_base_count |= 1 ; mem_bases = calloc(mem_base_count, sizeof(md_index)) ; + passert(mem_bases != NULL) ; + if (bases_was == NULL) passert(count_was == 0) ; else @@ -205,6 +207,8 @@ mem_md_make_descriptors(void) = mem_page_table[(mdi >> md_i_index_bits) & md_page_mask] = calloc(md_i_index_count, sizeof(struct mem_descriptor)) ; + passert(mem_free_descriptors != NULL) ; + mem_next_index += md_i_index_count ; if (mdi == 0) -- cgit v1.2.3