procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid crashing due to closing of font whose driver pointer is NULL.

Browse source 
src/alloc.c (cleanup_vector): Don't call the font driver's 'close'
 method if the 'driver' pointer is NULL.
This commit is contained in:
Eli Zaretskii 2013-12-14 11:16:10 +02:00
parent 0b32070bbd
commit 95c216526e
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2013-12-14 Eli Zaretskii <eliz@gnu.org>
* alloc.c (cleanup_vector): Don't call the font driver's 'close'
method if the 'driver' pointer is NULL.
* fileio.c (Fcopy_file) [WINDOWSNT]: Move most of the
Windows-specific code to w32.c. Change error message text to
match that of Posix platforms.

7
src/alloc.c
View file

@ -2877,7 +2877,12 @@ cleanup_vector (struct Lisp_Vector *vector)
if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_FONT)
&& ((vector->header.size & PSEUDOVECTOR_SIZE_MASK)
== FONT_OBJECT_MAX))
((struct font *) vector)->driver->close ((struct font *) vector);
{
struct font *fnt = (struct font *) vector;
if (fnt->driver)
fnt->driver->close ((struct font *) vector);
}
}
/* Reclaim space used by unmarked vectors. */