[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 b3cab41 2/2: Backport: Plug memory leak in GTK x-
From: |
Alexander Gramiak |
Subject: |
[Emacs-diffs] emacs-26 b3cab41 2/2: Backport: Plug memory leak in GTK x-display-monitor-attributes-list |
Date: |
Sun, 14 Apr 2019 18:02:37 -0400 (EDT) |
branch: emacs-26
commit b3cab4199a46b30539a24fb4d4b53ccdf488253e
Author: Alexander Gramiak <address@hidden>
Commit: Alexander Gramiak <address@hidden>
Backport: Plug memory leak in GTK x-display-monitor-attributes-list
* src/frame.c (free_monitors) [USE_GTK]: Define in the GTK case as
well.
* src/xfns.c (x-display-monitor-attributes-list) [USE_GTK]: Plug
memory leak. Use dupstring over xstrdup as gdk_monitor_get_model may
return NULL.
---
src/frame.c | 4 ++--
src/xfns.c | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index 9c3ff72..4ed140d 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -5533,8 +5533,8 @@ selected frame. This is useful when
`make-pointer-invisible' is set. */)
#ifdef HAVE_WINDOW_SYSTEM
-# if (defined HAVE_NS \
- || (!defined USE_GTK && (defined HAVE_XINERAMA || defined HAVE_XRANDR)))
+# if (defined USE_GTK || defined HAVE_NS || defined HAVE_XINERAMA \
+ || defined HAVE_XRANDR)
void
free_monitors (struct MonitorInfo *monitors, int n_monitors)
{
diff --git a/src/xfns.c b/src/xfns.c
index 732bc87..b53999a 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5009,7 +5009,7 @@ Internal use only, use `display-monitor-attributes-list'
instead. */)
mi->mm_height = height_mm;
#if GTK_CHECK_VERSION (3, 22, 0)
- mi->name = g_strdup (gdk_monitor_get_model (monitor));
+ dupstring (&mi->name, (gdk_monitor_get_model (monitor)));
#elif GTK_CHECK_VERSION (2, 14, 0)
mi->name = gdk_screen_get_monitor_plug_name (gscreen, i);
#endif
@@ -5020,6 +5020,11 @@ Internal use only, use `display-monitor-attributes-list'
instead. */)
primary_monitor,
monitor_frames,
source);
+#if GTK_CHECK_VERSION (2, 14, 0)
+ free_monitors (monitors, n_monitors);
+#else
+ xfree (monitors);
+#endif
unblock_input ();
#else /* not USE_GTK */