fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-08 12:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

evdev: Initliaze device->link so we can wl_list_remove() without crashing

Browse source 
We were testing for wl_list_empty() on a { NULL, NULL } list (which
returns false) and then wl_list_remove()ing the device (which crashes).
This commit is contained in:
Kristian Høgsberg 2013-08-26 14:35:32 -07:00
parent c2bc922348
commit 2471fac4d9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/evdev.c
View file

@ -603,6 +603,7 @@ evdev_device_create(struct weston_seat *seat, const char *path, int device_fd)
device->rel.dy = 0;
device->dispatch = NULL;
device->fd = device_fd;
wl_list_init(&device->link);
ioctl(device->fd, EVIOCGNAME(sizeof(devname)), devname);
devname[sizeof(devname) - 1] = '\0';
@ -646,8 +647,7 @@ evdev_device_destroy(struct evdev_device *device)
if (device->source)
wl_event_source_remove(device->source);
if (!wl_list_empty(&device->link))
wl_list_remove(&device->link);
wl_list_remove(&device->link);
if (device->mtdev)
mtdev_close_delete(device->mtdev);
close(device->fd);