debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for several segfaults in dtwm that happen with UTF-8 locale and were caused by unckeked XmeRenderTableGetDefaultFont return value

Browse Source
This commit is contained in:
Eugene Doudine
2014-02-21 13:34:04 +02:00
committed by Jon Trulson
parent 46a6a58fbd
commit 4c56765da3
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cde/programs/dtwm/Clock.c
View File

@@ -1027,8 +1027,13 @@ else if (G_ClockHandGC (g))
/* Get clock hand GC.
*/
font_rtn = XmeRenderTableGetDefaultFont (G_FontList (g), &font);
value_mask = GCForeground | GCFont | GCFillStyle;
value_mask = GCForeground | GCFillStyle;
if (XmeRenderTableGetDefaultFont (G_FontList (g), &font)) {
value_mask |= GCFont;
values.font = font->fid;
}
if (((G_PixmapForeground (g) == WhitePixelOfScreen (XtScreen (g))) &&
(G_PixmapBackground (g) == BlackPixelOfScreen (XtScreen (g)))) ||
@@ -1038,7 +1043,7 @@ if (((G_PixmapForeground (g) == WhitePixelOfScreen (XtScreen (g))) &&
else
values.foreground = mw->manager.top_shadow_color;
values.fill_style = FillSolid;
values.font = font->fid;
G_ClockHandGC (g) = XtGetGC ((Widget) mw, value_mask, &values);