From b6c888cc7afed65f24c023b8e90b73649f438e14 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Fri, 13 Dec 2013 17:34:05 +0400 Subject: [PATCH] * font.c (font_close_object): Check for live frame (Bug#16128). --- src/ChangeLog | 4 ++++ src/font.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0ffa9af77fc..2ae2f99b49a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-12-13 Dmitry Antipov + + * font.c (font_close_object): Check for live frame (Bug#16128). + 2013-12-13 Paul Eggert * gnutls.c, gnutls.h (emacs_gnutls_record_check_pending): diff --git a/src/font.c b/src/font.c index d0a10332028..9f284440143 100644 --- a/src/font.c +++ b/src/font.c @@ -2898,8 +2898,12 @@ font_close_object (Lisp_Object font_object) font->driver->close (font); #ifdef HAVE_WINDOW_SYSTEM eassert (font->frame); - eassert (FRAME_DISPLAY_INFO (font->frame)->n_fonts); - FRAME_DISPLAY_INFO (font->frame)->n_fonts--; + /* If the frame is gone, we can't do anything (Bug#16128). */ + if (FRAME_LIVE_P (font->frame)) + { + eassert (FRAME_DISPLAY_INFO (font->frame)->n_fonts); + FRAME_DISPLAY_INFO (font->frame)->n_fonts--; + } #endif } -- 2.39.2