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

desktop-shell: fix resize grab related crash

Browse Source 
This crash was happening when *releasing* a pointer button on a window
that was being resized and got destroyed during the grab.

[@daniels: Cosmetic fixes; apply same fix to grab cancel.]
This commit is contained in:
Greg V
2018-11-08 00:24:56 +03:00
committed by Daniel Stone
parent dce10bd141
commit ec3f779aa7
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/shell.c
+13 -6
View File
@@ -1654,12 +1654,16 @@ resize_grab_button(struct weston_pointer_grab *grab,
struct weston_resize_grab *resize = (struct weston_resize_grab *) grab; struct weston_resize_grab *resize = (struct weston_resize_grab *) grab;
struct weston_pointer *pointer = grab->pointer; struct weston_pointer *pointer = grab->pointer;
enum wl_pointer_button_state state = state_w; enum wl_pointer_button_state state = state_w;
struct weston_desktop_surface *desktop_surface =
resize->base.shsurf->desktop_surface;
if (pointer->button_count == 0 && if (pointer->button_count == 0 &&
state == WL_POINTER_BUTTON_STATE_RELEASED) { state == WL_POINTER_BUTTON_STATE_RELEASED) {
weston_desktop_surface_set_resizing(desktop_surface, false); if (resize->base.shsurf != NULL) {
struct weston_desktop_surface *desktop_surface =
resize->base.shsurf->desktop_surface;
weston_desktop_surface_set_resizing(desktop_surface,
false);
}
shell_grab_end(&resize->base); shell_grab_end(&resize->base);
free(grab); free(grab);
} }
@@ -1669,10 +1673,13 @@ static void
resize_grab_cancel(struct weston_pointer_grab *grab) resize_grab_cancel(struct weston_pointer_grab *grab)
{ {
struct weston_resize_grab *resize = (struct weston_resize_grab *) grab; struct weston_resize_grab *resize = (struct weston_resize_grab *) grab;
struct weston_desktop_surface *desktop_surface =
resize->base.shsurf->desktop_surface;
weston_desktop_surface_set_resizing(desktop_surface, false); if (resize->base.shsurf != NULL) {
struct weston_desktop_surface *desktop_surface =
resize->base.shsurf->desktop_surface;
weston_desktop_surface_set_resizing(desktop_surface, false);
}
shell_grab_end(&resize->base); shell_grab_end(&resize->base);
free(grab); free(grab);
} }