* xfns.c (xic_create_xfontset): Check that FRAME_XIC_BASE_FONTNAME

  is not NULL before strcmp.

diff --git a/src/xfns.c b/src/xfns.c
index 2889975e17533867e95d4264547b9e76642095bc..ae308c562ba029dc8eec81e066551034cccd5222 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1960,6 +1960,7 @@ xic_create_xfontset (f, base_fontname)
       struct frame *cf = XFRAME (frame);
       if (cf != f && FRAME_LIVE_P (f) && FRAME_X_P (cf)
           && FRAME_X_DISPLAY_INFO (cf) == FRAME_X_DISPLAY_INFO (f)
+          && FRAME_XIC_BASE_FONTNAME (cf)
           && !strcmp (FRAME_XIC_BASE_FONTNAME (cf), base_fontname))
         {
           xfs = FRAME_XIC_FONTSET (cf);