From 6cd9e9c4815d3c5cf82d3920bec816968640fec9 Mon Sep 17 00:00:00 2001 From: Gracana Date: Sat, 22 Jul 2017 00:05:58 -0400 Subject: [PATCH] Add check for font so error is generated instead of segfault. --- src/xdriver.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/xdriver.c b/src/xdriver.c index 03ec259..90ea5b8 100644 --- a/src/xdriver.c +++ b/src/xdriver.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #ifdef X_SHARED_MEM @@ -611,6 +612,10 @@ dev_video_init() } fflush(stdout); g_text_FontSt = XLoadQueryFont(g_display, FONT_NAME_STATUS); + if (g_text_FontSt == NULL) { + perror("Could not load font"); + exit(1); + } vid_printf("font # returned: %08x\n", (word32)(g_text_FontSt->fid)); font_height = g_text_FontSt->ascent + g_text_FontSt->descent; vid_printf("font_height: %d\n", font_height);