Merge branch 'maint'

* maint: xmalloc: include size in the failure message
2010-08-20 12:55:41 -07:00
parent 09a0ec58ce 55c6e6dc38
commit f9c3360570
1 changed files with 2 additions and 1 deletions
--- a/wrapper.c
+++ b/wrapper.c
@ -40,7 +40,8 @@ void *xmalloc(size_t size)
 		if (!ret && !size)
 			ret = malloc(1);
 		if (!ret)
-			die("Out of memory, malloc failed");
+			die("Out of memory, malloc failed (tried to allocate %lu bytes)",
+			    (unsigned long)size);
 	}
 #ifdef XMALLOC_POISON
 	memset(ret, 0xA5, size);