aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-11-03 21:04:18 +0200
committerEli Zaretskii2011-11-03 21:04:18 +0200
commit84c3edb9f2d86fcb6f6c44bd052f64fc9e9cdf60 (patch)
tree80a099c3e759d21f45edc2c63b6f91b0af970a07 /src
parent5bb8ec778bd4e9a942411031b9ebc0105e981009 (diff)
downloademacs-84c3edb9f2d86fcb6f6c44bd052f64fc9e9cdf60.tar.gz
emacs-84c3edb9f2d86fcb6f6c44bd052f64fc9e9cdf60.zip
Fix bug #9943 with abort at shutdown.
src/w32fns.c (unwind_create_frame): If needed, free the glyph matrices of the partially constructed frame.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32fns.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f1ba519d92a..7b3af18c2d5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-11-03 Eli Zaretskii <eliz@gnu.org>
2
3 * w32fns.c (unwind_create_frame): If needed, free the glyph
4 matrices of the partially constructed frame.
5
12011-11-01 Eli Zaretskii <eliz@gnu.org> 62011-11-01 Eli Zaretskii <eliz@gnu.org>
2 7
3 * xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment. 8 * xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment.
diff --git a/src/w32fns.c b/src/w32fns.c
index 2ecd6e91533..f7ba1c59e7b 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3993,6 +3993,7 @@ unwind_create_frame (Lisp_Object frame)
3993#endif 3993#endif
3994 3994
3995 x_free_frame_resources (f); 3995 x_free_frame_resources (f);
3996 free_glyphs (f);
3996 3997
3997#if GLYPH_DEBUG 3998#if GLYPH_DEBUG
3998 /* Check that reference counts are indeed correct. */ 3999 /* Check that reference counts are indeed correct. */