Fix bug #9943 with abort at shutdown.

 src/w32fns.c (unwind_create_frame): If needed, free the glyph
 matrices of the partially constructed frame.

diff --git a/src/ChangeLog b/src/ChangeLog
index f1ba519d92a31479e15984636633d20f3e49191e..7b3af18c2d544f071ce2a0c6656bf97f7b206cdf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-03  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32fns.c (unwind_create_frame): If needed, free the glyph
+       matrices of the partially constructed frame.
+
 2011-11-01  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment.

diff --git a/src/w32fns.c b/src/w32fns.c
index 2ecd6e915332676ddd081a20883380b99cc60c17..f7ba1c59e7bcdeb069555acbd1b0d915781f0846 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3993,6 +3993,7 @@ unwind_create_frame (Lisp_Object frame)
 #endif
 
       x_free_frame_resources (f);
+      free_glyphs (f);
 
 #if GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */