nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 09:27:59 +00:00
Code Issues Projects Releases Wiki Activity

unifontsel: add extra double-checks of fontinfo values.

Browse Source 
Coverity objected to several similar cases in this code in which I'd
checked a pointer for NULL after already having done things to it. I
think all the cases are benign, in that (as the comments tersely
mention) those checks could only fail if the unifontsel system had got
_really_ confused, in which case probably some other bug would have
been on the point of manifesting anyway. But Coverity has a point
anyway: if I'm _going_ to check those values for NULL, let's check
them consistently.
This commit is contained in:
Simon Tatham 2021-04-09 18:01:50 +01:00
parent 525b767c35
commit c5724c46a0
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
unix/gtkfont.c
View File

@ -2627,6 +2627,10 @@ static void unifontsel_setup_sizelist(unifontsel_internal *fs,
*/
for (i = start; i < end; i++) {
info = (fontinfo *)index234(fs->fonts_by_selorder, i);
if (!info) {
/* _shouldn't_ happen unless font list is completely funted */
break;
}
if (info->flags &~ fs->filter_flags) {
info->sizeindex = -1;
continue; /* we're filtering out this font */
@ -3135,9 +3139,11 @@ static void family_changed(GtkTreeSelection *treeselection, gpointer data)
gtk_tree_model_get(treemodel, &treeiter, 1, &minval, -1);
info = (fontinfo *)index234(fs->fonts_by_selorder, minval);
info = update_for_intended_size(fs, info);
if (!info)
return; /* _shouldn't_ happen unless font list is completely funted */
info = update_for_intended_size(fs, info);
if (!info)
return; /* similarly shouldn't happen */
if (!info->size)
fs->selsize = fs->intendedsize; /* font is scalable */
unifontsel_select_font(fs, info, info->size ? info->size : fs->selsize,
@ -3162,9 +3168,11 @@ static void style_changed(GtkTreeSelection *treeselection, gpointer data)
if (minval < 0)
return; /* somehow a charset heading got clicked */
info = (fontinfo *)index234(fs->fonts_by_selorder, minval);
info = update_for_intended_size(fs, info);
if (!info)
return; /* _shouldn't_ happen unless font list is completely funted */
info = update_for_intended_size(fs, info);
if (!info)
return; /* similarly shouldn't happen */
if (!info->size)
fs->selsize = fs->intendedsize; /* font is scalable */
unifontsel_select_font(fs, info, info->size ? info->size : fs->selsize,
@ -3187,6 +3195,8 @@ static void size_changed(GtkTreeSelection *treeselection, gpointer data)
gtk_tree_model_get(treemodel, &treeiter, 1, &minval, 2, &size, -1);
info = (fontinfo *)index234(fs->fonts_by_selorder, minval);
if (!info)
return; /* _shouldn't_ happen unless font list is completely funted */
unifontsel_select_font(fs, info, info->size ? info->size : size, 3, true);
}