diff options
| author | Jeka Friedrich <friedrix@gmail.com> | 2022-02-13 23:12:19 +0100 |
|---|---|---|
| committer | Jeka Friedrich <friedrix@gmail.com> | 2022-02-13 23:12:19 +0100 |
| commit | ea3eb6b70478b3c4860dbbf51d307a783d6c0687 (patch) | |
| tree | b8287b1f09cb8e9e69c7bef6301a518ae34e416e | |
| parent | f524e296131c87a8e69afe5eba14a379f1715b7c (diff) | |
| parent | a5272996f1f5b893f39f4b03191b15cea38710b8 (diff) | |
| download | wayland-ivi-extension-ea3eb6b70478b3c4860dbbf51d307a783d6c0687.tar.gz | |
Merge remote-tracking branch 'upstream/pull/122'
* upstream/pull/122
ivi-input-controller: Prevent use-after-free when tearing down seat
Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com>
| -rw-r--r-- | ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c index e5f2e1d..b4d54d1 100644 --- a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c +++ b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c @@ -917,18 +917,6 @@ destroy_seat(struct seat_ctx *ctx_seat) { struct ivisurface *surf; struct wl_resource *resource; - if (ctx_seat->keyboard_grab.keyboard) { - keyboard_grab_cancel(&ctx_seat->keyboard_grab); - weston_keyboard_end_grab(ctx_seat->keyboard_grab.keyboard); - } - if (ctx_seat->pointer_grab.pointer) { - pointer_grab_cancel(&ctx_seat->pointer_grab); - weston_pointer_end_grab(ctx_seat->pointer_grab.pointer); - } - if (ctx_seat->touch_grab.touch) { - touch_grab_cancel(&ctx_seat->touch_grab); - weston_touch_end_grab(ctx_seat->touch_grab.touch); - } /* Remove seat acceptance from surfaces which have input acceptance from * this seat */ |