(best_matching_font): Abort for best == NULL before we start to use it.

1 files changed, 18 insertions, 18 deletions

diff --git a/src/xfaces.c b/src/xfaces.c
index 2029f8fe65c..df303e401fd 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6677,30 +6677,30 @@ best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike)
                 best = fonts + i;
               }
           }
-
-      if (needs_overstrike)
-        {
-          enum xlfd_weight want_weight = specified[XLFD_WEIGHT];
-          enum xlfd_weight got_weight = best->numeric[XLFD_WEIGHT];
-
-          if (want_weight > XLFD_WEIGHT_MEDIUM && want_weight > got_weight)
-            {
-              /* We want a bold font, but didn't get one; try to use
-                 overstriking instead to simulate bold-face.  However,
-                 don't overstrike an already-bold fontn unless the
-                 desired weight grossly exceeds the available weight.  */
-              if (got_weight > XLFD_WEIGHT_MEDIUM)
-                *needs_overstrike = (got_weight - want_weight) > 2;
-              else
-                *needs_overstrike = 1;
-            }
-        }
     }
 
   /* We should have found SOME font.  */
   if (best == NULL)
     abort ();
 
+  if (! exact_p && needs_overstrike)
+    {
+      enum xlfd_weight want_weight = specified[XLFD_WEIGHT];
+      enum xlfd_weight got_weight = best->numeric[XLFD_WEIGHT];
+
+      if (want_weight > XLFD_WEIGHT_MEDIUM && want_weight > got_weight)
+        {
+          /* We want a bold font, but didn't get one; try to use
+             overstriking instead to simulate bold-face.  However,
+             don't overstrike an already-bold fontn unless the
+             desired weight grossly exceeds the available weight.  */
+          if (got_weight > XLFD_WEIGHT_MEDIUM)
+            *needs_overstrike = (got_weight - want_weight) > 2;
+          else
+            *needs_overstrike = 1;
+        }
+    }
+
   if (font_scalable_p (best))
     font_name = build_scalable_font_name (f, best, pt);
   else