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 <[email protected]> Reviewed-by: Quentin Glidic <[email protected]>
IcebergThings · Dec 8, 2016 · f15320f · f15320f
1 parent 2295a62
commit f15320f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/libweston-desktop/surface.c b/libweston-desktop/surface.c
@@ -269,6 +269,8 @@ weston_desktop_surface_create(struct weston_desktop *desktop,
 	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,14 +592,18 @@ weston_desktop_surface_get_pid(struct weston_desktop_surface *surface)
 {
 	pid_t pid;
 
-	if (surface->pid != 0) {
+	if (surface->pid != -1) {
 		pid = surface->pid;
 	} else {
 		struct weston_desktop_client *client =
 			weston_desktop_surface_get_client(surface);
 		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
@@ -241,6 +241,8 @@ create_surface(struct weston_desktop_xwayland *xwayland,
 	wl_resource_add_destroy_listener(wsurface->resource,
 					 &surface->resource_destroy_listener);
 
+	weston_desktop_surface_set_pid(surface->surface, 0);
+
 	return surface;
 }