Commit e0862eda authored by Paul Eggert's avatar Paul Eggert Committed by Eli Zaretskii

Work around GC+Cairo bug

Workaround suggested by Robert Pluim (Bug#20890#13).
* src/ftfont.c (ftfont_close) [USE_CAIRO]:
Do nothing if GC is in progress.
parent 0ecff00b
......@@ -1246,6 +1246,12 @@ ftfont_close (struct font *font)
/* FIXME: Although this function can be called while garbage-collecting,
the function assumes that Lisp data structures are properly-formed.
This invalid assumption can lead to core dumps (Bug#20890). */
#ifdef USE_CAIRO
/* Although this works around Bug#20890, it is probably not the
right thing to do. */
if (gc_in_progress)
return;
#endif
struct ftfont_info *ftfont_info = (struct ftfont_info *) font;
Lisp_Object val, cache;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment