From bb0b2838a5c8b8deb7f98747108c05ec8981d215 Mon Sep 17 00:00:00 2001 From: Liang Chang Date: Mon, 8 Feb 2021 05:47:05 +0800 Subject: [PATCH] dtappbuilder: apply graceful degradation for font loading to avoid a segmentation fault. --- cde/programs/dtappbuilder/src/ab/brws.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cde/programs/dtappbuilder/src/ab/brws.c b/cde/programs/dtappbuilder/src/ab/brws.c index 267d477cf..cbc9de320 100644 --- a/cde/programs/dtappbuilder/src/ab/brws.c +++ b/cde/programs/dtappbuilder/src/ab/brws.c @@ -1881,12 +1881,14 @@ setup_vwr_graphics( GCForeground|GCBackground|GCGraphicsExposures|GCLineWidth, &gcvalues); } - if (!ui_handle->sm_font) - { + if (!ui_handle->sm_font) ui_handle->sm_font = (XFontStruct *)XLoadQueryFont(dpy, sm_font_name); - XSetFont(dpy, ui_handle->normal_gc, ui_handle->sm_font->fid); - XSetFont(dpy, ui_handle->select_gc, ui_handle->sm_font->fid); - } + + if (!ui_handle->sm_font) + ui_handle->sm_font = (XFontStruct *)XLoadQueryFont(dpy, XmDEFAULT_FONT); + + XSetFont(dpy, ui_handle->normal_gc, ui_handle->sm_font->fid); + XSetFont(dpy, ui_handle->select_gc, ui_handle->sm_font->fid); } /*