Apple-2-Tools/gsplus
1
0
Fork 0
mirror of https://github.com/digarok/gsplus.git synced 2024-11-28 04:49:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18 from ghost/master

Browse Source 
Add check for font so error is generated instead of segfault.
This commit is contained in:
Dagen Brock 2018-07-27 13:49:51 -05:00 committed by GitHub
commit 780ab7fcd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/xdriver.c
View File

@ -31,6 +31,7 @@
#include <X11/keysym.h> #include <X11/keysym.h>
#include <time.h> #include <time.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <signal.h> #include <signal.h>
#ifdef X_SHARED_MEM #ifdef X_SHARED_MEM
@ -611,6 +612,10 @@ dev_video_init()
} }
fflush(stdout); fflush(stdout);
g_text_FontSt = XLoadQueryFont(g_display, FONT_NAME_STATUS); 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)); vid_printf("font # returned: %08x\n", (word32)(g_text_FontSt->fid));
font_height = g_text_FontSt->ascent + g_text_FontSt->descent; font_height = g_text_FontSt->ascent + g_text_FontSt->descent;
vid_printf("font_height: %d\n", font_height); vid_printf("font_height: %d\n", font_height);