Fix calls to {m,c,re}alloc so that they use x{m,c,re}alloc instead of

segfaulting or handling errors the same way themselves.

2 files changed, 2 insertions, 10 deletions

diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 927c2bad4..e93ca3186 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -102,12 +102,8 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
 	u_short unicode;
 
 	maxct = tailsz;				/* more than enough */
-	up = (struct unipair *) malloc(maxct * sizeof(struct unipair));
+	up = (struct unipair *) xmalloc(maxct * sizeof(struct unipair));
 
-	if (!up) {
-		errorMsg("Out of memory?\n");
-		exit(1);
-	}
 	for (glyph = 0; glyph < fontsize; glyph++) {
 		while (tailsz >= 2) {
 			unicode = (((u_short) inbuf[1]) << 8) + inbuf[0];
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 488585f9c..2321a1ede 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -67,11 +67,7 @@ int loadkmap_main(int argc, char **argv)
 		exit(FALSE);
 	}
 
-	ibuff = (u_short *) malloc(ibuffsz);
-	if (!ibuff) {
-		errorMsg("Out of memory.\n");
-		exit(FALSE);
-	}
+	ibuff = (u_short *) xmalloc(ibuffsz);
 
 	for (i = 0; i < MAX_NR_KEYMAPS; i++) {
 		if (flags[i] == 1) {