[PATCH weston v2] Fix trivial memory leaks

Ryo Munakata ryomnktml at gmail.com
Sun Mar 8 03:17:06 PDT 2015


Signed-off-by: Ryo Munakata <ryomnktml at gmail.com>
---
 desktop-shell/shell.c | 2 ++
 src/compositor-x11.c  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index aae304d..826692f 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -6453,6 +6453,8 @@ shell_destroy(struct wl_listener *listener, void *data)
 		wl_client_destroy(shell->child.client);
 	}
 
+	wl_event_source_remove(shell->screensaver.timer);
+
 	wl_list_remove(&shell->idle_listener.link);
 	wl_list_remove(&shell->wake_listener.link);
 
diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index aa1e519..e9735c5 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -1454,6 +1454,8 @@ x11_compositor_get_wm_info(struct x11_compositor *c)
 		if (atom[i] == c->atom.net_wm_state_fullscreen)
 			c->has_net_wm_state_fullscreen = 1;
 	}
+
+	free(reply);
 }
 
 static void
-- 
2.3.2



More information about the wayland-devel mailing list