1 files changed, 4 insertions, 0 deletions

diff --git a/src/font.c b/src/font.c
index b911ac13030..691f8bc1282 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2703,6 +2703,7 @@ font_find_for_lface (f, lface, spec, c)
   if (NILP (val))
     return Qnil;
   result = font_has_char (f, val, c);
+  font_close_object (f, val);
   if (result > 0)
     return val;
   return Qnil;
@@ -3566,6 +3567,9 @@ FONT-OBJECT.  */)
         args_out_of_range_3 (string, from, to);
     }
 
+  if (! FONT_OBJECT_P (font_object))
+    return to;
+
   CHECK_FONT_GET_OBJECT (font_object, font);
   len = end - start;
   gstring = Ffont_make_gstring (font_object, make_number (len));