Fix bug #16509 with segfault in an assertion when exiting due to missing font.

 src/w32fns.c (unwind_create_frame): Avoid crashing inside assertion
 when the image cache is not yet allocated.

diff --git a/src/ChangeLog b/src/ChangeLog
index 99a3e7e729906015f40fde07f10575ab2aef7ca9..eb05786e3fa659f2ab5d5dbcf3b04f337652372e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-21  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32fns.c (unwind_create_frame): Avoid crashing inside assertion
+       when the image cache is not yet allocated.  (Bug#16509)
+
 2014-01-21  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * buffer.c (Fkill_buffer): When killing an indirect buffer,

diff --git a/src/w32fns.c b/src/w32fns.c
index d6f3fe7a3eb3a03d7f6288c79063324c279b9a59..0d9656475993a3a9e497b181cc076a78dc362cc5 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4250,7 +4250,9 @@ unwind_create_frame (Lisp_Object frame)
 #ifdef GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */
       eassert (dpyinfo->reference_count == dpyinfo_refcount);
-      eassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
+      eassert ((dpyinfo->terminal->image_cache == NULL
+               && image_cache_refcount == 0)
+              || dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
 #endif
       return Qt;
     }