mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 09:51:22 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
src/w32fns.c (unwind_create_frame): Avoid crashing inside assertion
 when the image cache is not yet allocated.
This commit is contained in:
Eli Zaretskii 2014-01-21 18:08:31 +02:00
parent 63389c254e
commit f7551c6c33
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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,

4
src/w32fns.c
View file

@ -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;
}