Mon Jan 17 13:09:37 PST 2000 Michael Jennings <mej@eterm.org>

	Fixed the faulty assumption that font->per_char is always non-NULL.


SVN revision: 1934

1 files changed, 8 insertions, 6 deletions

diff --git a/src/font.c b/src/font.c
index 38e1412..2d0748e 100644
--- a/src/font.c
+++ b/src/font.c
@@ -436,7 +436,7 @@ change_font(int init, const char *fontname)
     TermWin.fprop = 0;	/* Mono-spaced (fixed width) font */
   else
     TermWin.fprop = 1;	/* Proportional font */
-  if (TermWin.fprop == 1)
+  if (TermWin.fprop == 1 && TermWin.font->per_char)
     for (i = TermWin.font->min_char_or_byte2; i <= TermWin.font->max_char_or_byte2; i++) {
       cw = TermWin.font->per_char[i].width;
       MAX_IT(fw, cw);
@@ -459,11 +459,13 @@ change_font(int init, const char *fontname)
       if (fw != boldFont->max_bounds.width)
 	fw = -1;
     } else {
-      for (i = 0; i < 256; i++) {
-	if (!isprint(i))
-	  continue;
-	cw = boldFont->per_char[i].width;
-	MAX_IT(fw, cw);
+      if (boldFont->per_char) {
+        for (i = 0; i < 256; i++) {
+          if (!isprint(i))
+            continue;
+          cw = boldFont->per_char[i].width;
+          MAX_IT(fw, cw);
+        }
       }
     }