[mutter] xwayland: plug some leaks in stop function



commit eb56e0a3d7a7d010862eddb6306c7d02997152cf
Author: Ray Strode <rstrode redhat com>
Date:   Thu Apr 23 10:34:43 2015 -0400

    xwayland: plug some leaks in stop function
    
    This commit makes sure the lockfile and display
    name are freed in meta_xwayland_stop.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=748380

 src/wayland/meta-xwayland.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index ad6667e..a7beb0c 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -532,5 +532,10 @@ meta_xwayland_stop (MetaXWaylandManager *manager)
   snprintf (path, sizeof path, "/tmp/.X11-unix/X%d", manager->display_index);
   unlink (path);
 
-  unlink (manager->lock_file);
+  g_clear_pointer (&manager->display_name, g_free);
+  if (manager->lock_file)
+    {
+      unlink (manager->lock_file);
+      g_clear_pointer (&manager->lock_file, g_free);
+    }
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]