Thu Nov 21 14:03:23 2002 Michael Jennings (mej)

Fix for Debian Bug #169933, seg fault with invalid default font index.


SVN revision: 6456
This commit is contained in:
Michael Jennings 2002-11-21 19:06:43 +00:00
parent 6d1597926e
commit b93dddf773
2 changed files with 9 additions and 1 deletions

View File

@ -4927,3 +4927,7 @@ Hopefully improve exit handling.
Change "export TERM=vt100" to the portable "TERM=vt100; export TERM"
syntax.
----------------------------------------------------------------------
Thu Nov 21 14:03:23 2002 Michael Jennings (mej)
Fix for Debian Bug #169933, seg fault with invalid default font index.
----------------------------------------------------------------------

View File

@ -458,8 +458,12 @@ change_font(int init, const char *fontname)
D_FONT(("change_font(%d, \"%s\"): def_font_idx == %u, font_idx == %u\n", init, NONULL(fontname), (unsigned int) def_font_idx, (unsigned int) font_idx));
if (init) {
font_idx = def_font_idx;
ASSERT(etfonts != NULL);
if ((def_font_idx >= font_cnt) || (etfonts[def_font_idx] == NULL)) {
def_font_idx = font_idx;
} else {
font_idx = def_font_idx;
}
ASSERT(etfonts[font_idx] != NULL);
#ifdef MULTI_CHARSET
ASSERT(etmfonts != NULL);