diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-01-21 18:08:31 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-01-21 18:08:31 +0200 |
| commit | f7551c6c33394b4cdfb9da378aa2ea1cb2534a4e (patch) | |
| tree | 2602f8b00fbac068a5ad455efeb3b8e809cbcc06 /src/w32fns.c | |
| parent | 63389c254e73b53a253676ff45e8b089e45c1f31 (diff) | |
| download | emacs-f7551c6c33394b4cdfb9da378aa2ea1cb2534a4e.tar.gz emacs-f7551c6c33394b4cdfb9da378aa2ea1cb2534a4e.tar.bz2 emacs-f7551c6c33394b4cdfb9da378aa2ea1cb2534a4e.zip | |
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.
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index d6f3fe7a3eb..0d965647599 100644 --- 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; } |