From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Wed, 2 Apr 2014 16:17:08 +0000 (+0400)
Subject: * xterm.c (x_term_init) [USE_LUCID]: Fix minor memory leak.
X-Git-Tag: emacs-25.0.90~2612^2~709^2~1109
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ed859c7aea4db00135a2c0e692895b3d13e99351;p=emacs.git

* xterm.c (x_term_init) [USE_LUCID]: Fix minor memory leak.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 6638325a434..22b15a5b00f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -23,6 +23,8 @@
 	(font_matching_entity): Likewise.  If matching entity is found, insert
 	1-item vector with this entity instead of entity itself (Bug#17125).
 
+	* xterm.c (x_term_init) [USE_LUCID]: Fix minor memory leak.
+
 2014-04-01  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* fns.c (validate_subarray): Rename from validate_substring,
diff --git a/src/xterm.c b/src/xterm.c
index b0d64dfeb7f..8c4e78073dd 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10162,6 +10162,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
 
 #ifdef USE_LUCID
   {
+    XFontStruct *xfont = NULL;
     XrmValue d, fr, to;
     Font font;
 
@@ -10175,8 +10176,10 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
     x_catch_errors (dpy);
     if (!XtCallConverter (dpy, XtCvtStringToFont, &d, 1, &fr, &to, NULL))
       emacs_abort ();
-    if (x_had_errors_p (dpy) || !XQueryFont (dpy, font))
+    if (x_had_errors_p (dpy) || !((xfont = XQueryFont (dpy, font))))
       XrmPutLineResource (&xrdb, "Emacs.dialog.*.font: 9x15");
+    if (xfont)
+      XFreeFont (dpy, xfont);
     x_uncatch_errors ();
   }
 #endif