1 files changed, 2 insertions, 1 deletions

diff --git a/src/xfns.c b/src/xfns.c
index 1f399f5a9c4..3ae6c7c2c60 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3239,7 +3239,8 @@ even if they match PATTERN and FACE.")
           if (thisinfo && same_size_fonts (thisinfo, size_ref))
             newlist = Fcons (XCONS (tem)->car, newlist);
 
-          XFreeFont (FRAME_X_DISPLAY (f), thisinfo);
+          if (thisinfo != 0)
+            XFreeFont (FRAME_X_DISPLAY (f), thisinfo);
         }
 
       UNBLOCK_INPUT;