mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libweston-desktop: don't crash when getting the pid for X clients

Browse Source 
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>
This commit is contained in:
Giulio Camuffo
2016-12-08 09:21:08 +01:00
committed by Quentin Glidic
parent 2295a62788
commit f15320faee
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston-desktop/surface.c
+7 -1
View File
@@ -269,6 +269,8 @@ weston_desktop_surface_create(struct weston_desktop *desktop,
wsurface->committed = weston_desktop_surface_committed; wsurface->committed = weston_desktop_surface_committed;
wsurface->committed_private = surface; wsurface->committed_private = surface;
surface->pid = -1;
surface->surface_commit_listener.notify = surface->surface_commit_listener.notify =
weston_desktop_surface_surface_committed; weston_desktop_surface_surface_committed;
wl_signal_add(&surface->surface->commit_signal, wl_signal_add(&surface->surface->commit_signal,
@@ -590,7 +592,7 @@ weston_desktop_surface_get_pid(struct weston_desktop_surface *surface)
{ {
pid_t pid; pid_t pid;
if (surface->pid != 0) { if (surface->pid != -1) {
pid = surface->pid; pid = surface->pid;
} else { } else {
struct weston_desktop_client *client = struct weston_desktop_client *client =
@@ -598,6 +600,10 @@ weston_desktop_surface_get_pid(struct weston_desktop_surface *surface)
struct wl_client *wl_client = struct wl_client *wl_client =
weston_desktop_client_get_client(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); wl_client_get_credentials(wl_client, &pid, NULL, NULL);
} }
return pid; return pid;
libweston-desktop/xwayland.c
+2
View File
@@ -241,6 +241,8 @@ create_surface(struct weston_desktop_xwayland *xwayland,
wl_resource_add_destroy_listener(wsurface->resource, wl_resource_add_destroy_listener(wsurface->resource,
&surface->resource_destroy_listener); &surface->resource_destroy_listener);
weston_desktop_surface_set_pid(surface->surface, 0);
return surface; return surface;
} }