libweston-desktop: don't crash when getting the pid for X clients
X client's don't have a wl_client associated with their
weston_desktop_client, so make sure to not use it.
Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
diff --git a/libweston-desktop/surface.c b/libweston-desktop/surface.c
index 2205107..d3be936 100644
--- a/libweston-desktop/surface.c
+++ b/libweston-desktop/surface.c
@@ -269,6 +269,8 @@
wsurface->committed = weston_desktop_surface_committed;
wsurface->committed_private = surface;
+ surface->pid = -1;
+
surface->surface_commit_listener.notify =
weston_desktop_surface_surface_committed;
wl_signal_add(&surface->surface->commit_signal,
@@ -590,7 +592,7 @@
{
pid_t pid;
- if (surface->pid != 0) {
+ if (surface->pid != -1) {
pid = surface->pid;
} else {
struct weston_desktop_client *client =
@@ -598,6 +600,10 @@
struct wl_client *wl_client =
weston_desktop_client_get_client(client);
+ /* wl_client should always be valid, because only in the
+ * xwayland case it wouldn't be, but in that case we won't
+ * reach here, as the pid is initialized to 0. */
+ assert(wl_client);
wl_client_get_credentials(wl_client, &pid, NULL, NULL);
}
return pid;
diff --git a/libweston-desktop/xwayland.c b/libweston-desktop/xwayland.c
index baacf7b..6b90c14 100644
--- a/libweston-desktop/xwayland.c
+++ b/libweston-desktop/xwayland.c
@@ -241,6 +241,8 @@
wl_resource_add_destroy_listener(wsurface->resource,
&surface->resource_destroy_listener);
+ weston_desktop_surface_set_pid(surface->surface, 0);
+
return surface;
}