From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Sun, 21 Apr 2019 00:53:39 +0000 (+0900)
Subject: * lwlib/lwlib-Xaw.c (draw_text) [HAVE_XFT]: Fix memory leak.
X-Git-Tag: emacs-27.0.90~3171
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=75e68b87778d0f0a803980d59793b78834443972;p=emacs.git

* lwlib/lwlib-Xaw.c (draw_text) [HAVE_XFT]: Fix memory leak.
---

diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 24b31fc2956..8e3a07f202f 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -170,11 +170,12 @@ draw_text (struct widget_xft_data *data, char *lbl, int inverse)
   int x = inverse ? 0 : 2;
   char *bp = lbl;
 
-  data->xft_draw = XftDrawCreate (XtDisplay (data->widget),
-                                  data->p,
-                                  DefaultVisual (XtDisplay (data->widget),
-                                                 screen),
-                                  DefaultColormapOfScreen (sc));
+  if (!data->xft_draw)
+    data->xft_draw = XftDrawCreate (XtDisplay (data->widget),
+				    data->p,
+				    DefaultVisual (XtDisplay (data->widget),
+						   screen),
+				    DefaultColormapOfScreen (sc));
   XftDrawRect (data->xft_draw,
                inverse ? &data->xft_fg : &data->xft_bg,
                0, 0, data->p_width, data->p_height);