From d0af7f2851b1d6b8d0aed79e9647ce0502388d07 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 2 May 2014 07:53:24 +1000 Subject: [PATCH] Ignore NULL as argument in libevdev_uinput_destroy() Triggered by the tests when run as non-root. Simply ignore any attempt to destroy a NULL device, which also matches the behaviour of libevdev_free(). Reported-by: Andreas Radke Reviewed-by: Daniel Martin Tested-by: Daniel Martin Reviewed-by: David Herrmann Signed-off-by: Peter Hutterer --- libevdev/libevdev-uinput.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libevdev/libevdev-uinput.c b/libevdev/libevdev-uinput.c index 0543bc4..f176a00 100644 --- a/libevdev/libevdev-uinput.c +++ b/libevdev/libevdev-uinput.c @@ -334,6 +334,9 @@ error: LIBEVDEV_EXPORT void libevdev_uinput_destroy(struct libevdev_uinput *uinput_dev) { + if (!uinput_dev) + return; + ioctl(uinput_dev->fd, UI_DEV_DESTROY, NULL); if (uinput_dev->fd_is_managed) close(uinput_dev->fd);