From 5ae356d99130af32b51a0cd67d1933ed9e6cd20e Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Mon, 16 Dec 2013 11:45:33 +0400 Subject: * font.c (valid_font_driver) [ENABLE_CHECKING]: New function intended to find bogus pointers in font objects (Bug#16140). * font.h (valid_font_driver) [ENABLE_CHECKING]: Add prototype. * alloc.c (cleanup_vector): Use valid_font_driver in eassert. (compact_font_cache_entry, compact_font_caches) [!HAVE_NTGUI]: Disable for MS-Windows due to Bug#15876; apparently this requires more or less substantial changes in fontset code. * xfont.c (xfont_close): * xftfont.c (xftfont_close): Call x_display_info_for_display to check whether 'Display *' is valid (Bug#16093 and probably Bug#16069). --- src/xftfont.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/xftfont.c') diff --git a/src/xftfont.c b/src/xftfont.c index 37b33b3ead8..178981c4958 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -491,7 +491,9 @@ xftfont_close (struct font *font) } #endif - if (xftfont_info->xftfont) + /* See comment in xfont_close. */ + if (xftfont_info->xftfont + && x_display_info_for_display (xftfont_info->display)) { block_input (); XftUnlockFace (xftfont_info->xftfont); -- cgit v1.2.3