mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libinput: allow evdev_device_set_output(dev, NULL) 

Removing the output association from an evdev_device is more than just
setting the pointer to NULL, one also needs to remove the destroy
listener and flag the destroy listener as unused (notify == NULL).

evdev_device_set_output() can already remove associations, so let it
also handle an assignment to NULL output.

Fix notify_output_destroy() to handle removing an association correctly.
Previously, the listener was left "used", which would mean the next call
to evdev_device_set_output() would have wl_list_remove()'d, accessing
freed memory. This could be triggered by having a touchscreen with a
specified output association, and unplugging then re-plugging the
corresponding output.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Pekka Paalanen 2017-04-20 11:38:06 +03:00
parent 018e6ade21
commit 98d50cc311
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libweston/libinput-device.c
View File

@ -442,7 +442,7 @@ notify_output_destroy(struct wl_listener *listener, void *data)
struct weston_output, link);
evdev_device_set_output(device, output);
} else {
device->output = NULL;
evdev_device_set_output(device, NULL);
}
}
@ -557,6 +557,14 @@ evdev_device_set_output(struct evdev_device *device,
device->output_destroy_listener.notify = NULL;
}
if (!output) {
weston_log("output for input device %s removed\n",
libinput_device_get_sysname(device->device));
device->output = NULL;
return;
}
weston_log("associating input device %s with output %s "
"(%s by udev)\n",
libinput_device_get_sysname(device->device),