From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 3 Nov 2011 21:56:32 +0000 (+0200)
Subject: Fix bug #9943 on X.
X-Git-Tag: emacs-pretest-24.0.92~224
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a58bbc1830abaf7b51cb9d94df884dc92071ddf;p=emacs.git

Fix bug #9943 on X.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 67f8507a26b..cc3391cfee5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
 	* w32fns.c (unwind_create_frame): If needed, free the glyph
 	matrices of the partially constructed frame.  (Bug#9943)
+	* xfns.c (unwind_create_frame): Likewise.
 
 2011-11-01  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/xfns.c b/src/xfns.c
index 913cde75d91..ac030582ffe 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2936,6 +2936,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.  */