[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a35e06b: Plug memory leak in GTK x-display-monitor-
From: |
Alexander Gramiak |
Subject: |
[Emacs-diffs] master a35e06b: Plug memory leak in GTK x-display-monitor-attributes-list |
Date: |
Sun, 7 Apr 2019 14:50:24 -0400 (EDT) |
branch: master
commit a35e06bbe27c5907f56c5aeb48182d7be00d1dec
Author: Alexander Gramiak <address@hidden>
Commit: Alexander Gramiak <address@hidden>
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.
* src/frame.h (MonitorInfo): Declare name as pointing to const char.
---
src/frame.c | 4 ++--
src/frame.h | 2 +-
src/xfns.c | 7 ++++++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index d0c7714..6fdb7d0 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -5662,8 +5662,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/frame.h b/src/frame.h
index ed62e7a..b1eedf3 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1648,7 +1648,7 @@ flush_frame (struct frame *f)
struct MonitorInfo {
XRectangle geom, work;
int mm_width, mm_height;
- char *name;
+ const char *name;
};
extern void free_monitors (struct MonitorInfo *monitors, int n_monitors);
diff --git a/src/xfns.c b/src/xfns.c
index f238a3d..9a25b00 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5030,7 +5030,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));
+ mi->name = xstrdup (gdk_monitor_get_model (monitor));
#elif GTK_CHECK_VERSION (2, 14, 0)
mi->name = gdk_screen_get_monitor_plug_name (gscreen, i);
#endif
@@ -5041,6 +5041,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 */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master a35e06b: Plug memory leak in GTK x-display-monitor-attributes-list,
Alexander Gramiak <=