Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
52a6194f
Commit
52a6194f
authored
Jun 19, 2014
by
Dmitry Antipov
Browse files
* font.c (font_make_object): Avoid dangling pointer which may
crash GC (Bug#17771).
parent
bc2fb4fd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
src/ChangeLog
src/ChangeLog
+5
-0
src/font.c
src/font.c
+3
-0
No files found.
src/ChangeLog
View file @
52a6194f
2014-06-19 Dmitry Antipov <dmantipov@yandex.ru>
* font.c (font_make_object): Avoid dangling pointer which may
crash GC (Bug#17771).
2014-06-18 Eli Zaretskii <eliz@gnu.org>
2014-06-18 Eli Zaretskii <eliz@gnu.org>
* image.c [5 < GIFLIB_MAJOR + (1 <= GIFLIB_MINOR)]: Declare the
* image.c [5 < GIFLIB_MAJOR + (1 <= GIFLIB_MINOR)]: Declare the
...
...
src/font.c
View file @
52a6194f
...
@@ -207,6 +207,9 @@ font_make_object (int size, Lisp_Object entity, int pixelsize)
...
@@ -207,6 +207,9 @@ font_make_object (int size, Lisp_Object entity, int pixelsize)
=
(
struct
font
*
)
allocate_pseudovector
(
size
,
FONT_OBJECT_MAX
,
PVEC_FONT
);
=
(
struct
font
*
)
allocate_pseudovector
(
size
,
FONT_OBJECT_MAX
,
PVEC_FONT
);
int
i
;
int
i
;
/* GC can happen before the driver is set up,
so avoid dangling pointer here (Bug#17771). */
font
->
driver
=
NULL
;
XSETFONT
(
font_object
,
font
);
XSETFONT
(
font_object
,
font
);
if
(
!
NILP
(
entity
))
if
(
!
NILP
(
entity
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment