[Emacs-diffs] trunk r116097: Fix bug #16509 with segfault in an assertion when exiting due to missing font.

[Eli Zaretskii]

------------------------------------------------------------
revno: 116097
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16509
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2014-01-21 18:08:31 +0200
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32fns.c                   w32fns.c-20091113204419-o5vbwnq5f7feedwu-945

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-01-21 02:28:57 +0000
+++ b/src/ChangeLog     2014-01-21 16:08:31 +0000
@@ -1,3 +1,8 @@
+2014-01-21  Eli Zaretskii  <address@hidden>
+
+       * w32fns.c (unwind_create_frame): Avoid crashing inside assertion
+       when the image cache is not yet allocated.  (Bug#16509)
+
 2014-01-21  Dmitry Antipov  <address@hidden>
 
        * buffer.c (Fkill_buffer): When killing an indirect buffer,

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2014-01-11 09:31:09 +0000
+++ b/src/w32fns.c      2014-01-21 16:08:31 +0000
@@ -4250,7 +4250,9 @@
 #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;
     }