XLibre/xf86-input-libinput
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-libinput.git synced 2026-03-24 01:24:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bail out of PreInit if the parent driver data is NULL

Browse Source 
If the parent device is removed before the WorkProc is called, the private
data is NULL.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer
2016-08-03 16:17:03 +10:00
parent fb4847d243
commit 116cddba69
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/xf86libinput.c
View File

@@ -2599,9 +2599,12 @@ xf86libinput_pre_init(InputDriverPtr drv,
xf86IDrvMsg(pInfo, X_ERROR, "Failed to find parent device\n");
goto fail;
}
xf86IDrvMsg(pInfo, X_INFO, "is a virtual subdevice\n");
parent_driver_data = parent->private;
if (!parent_driver_data) /* parent already removed again */
goto fail;
xf86IDrvMsg(pInfo, X_INFO, "is a virtual subdevice\n");
shared_device = xf86libinput_shared_ref(parent_driver_data->shared_device);
device = shared_device->device;
}