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

Add missing checks in update_for_intended_size() in the font selector

Browse Source 
code, which would have coped badly if ever asked to select the first
font in the list at a size smaller than it supported. Luckily the
first font tended to be one of the X numeric aliases (e.g. 10x20)
which was stored with size zero, so this probably didn't actually come
up for anyone, but better safe than sorry.

[originally from svn r9910]
This commit is contained in:
Simon Tatham 2013-07-11 17:24:28 +00:00
parent 5a04ae3420
commit 3d69dd2071
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unix/gtkfont.c
View File

@ -2288,6 +2288,8 @@ static fontinfo *update_for_intended_size(unifontsel_internal *fs,
*/
below = findrelpos234(fs->fonts_by_selorder, &info2, NULL,
REL234_LE, &pos);
if (!below)
pos = -1;
above = index234(fs->fonts_by_selorder, pos+1);
/*
@ -2295,7 +2297,7 @@ static fontinfo *update_for_intended_size(unifontsel_internal *fs,
* case. If we have, it'll be in `below' and not `above',
* because we did a REL234_LE rather than REL234_LT search.
*/
if (!fontinfo_selorder_compare(&info2, below))
if (below && !fontinfo_selorder_compare(&info2, below))
return below;
/*