upstream

2 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f1ba519d92a..67f8507a26b 100644
--- 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.  (Bug#9943)
+
 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 2ecd6e91533..f7ba1c59e7b 100644
--- 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.  */