nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-21 22:28:37 -05:00
Code Issues Projects Releases Wiki Activity

Prevent NULL-dereferencing segfaults when the font selector is

Browse Source 
invoked with no valid font in the input text.

[originally from svn r7952]
This commit is contained in:
Simon Tatham 2008-03-29 13:59:31 +00:00
parent 0527d54f03
commit f07f782547
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
unix/gtkfont.c
View File

@ -1474,15 +1474,18 @@ static void unifontsel_set_filter_buttons(unifontsel_internal *fs)
static void unifontsel_draw_preview_text(unifontsel_internal *fs) static void unifontsel_draw_preview_text(unifontsel_internal *fs)
{ {
unifont *font; unifont *font;
char *sizename; char *sizename = NULL;
fontinfo *info = fs->selected; fontinfo *info = fs->selected;
sizename = info->fontclass->scale_fontname if (info) {
(GTK_WIDGET(fs->u.window), info->realname, fs->selsize); sizename = info->fontclass->scale_fontname
(GTK_WIDGET(fs->u.window), info->realname, fs->selsize);
font = info->fontclass->create(GTK_WIDGET(fs->u.window),
sizename ? sizename : info->realname,
FALSE, FALSE, 0, 0);
} else
font = NULL;
font = info->fontclass->create(GTK_WIDGET(fs->u.window),
sizename ? sizename : info->realname,
FALSE, FALSE, 0, 0);
if (fs->preview_pixmap) { if (fs->preview_pixmap) {
GdkGC *gc = gdk_gc_new(fs->preview_pixmap); GdkGC *gc = gdk_gc_new(fs->preview_pixmap);
gdk_gc_set_foreground(gc, &fs->preview_bg); gdk_gc_set_foreground(gc, &fs->preview_bg);