Ignore NULL as argument in libevdev_uinput_destroy()
authorPeter Hutterer <peter.hutterer@who-t.net>
Thu, 1 May 2014 21:53:24 +0000 (07:53 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Wed, 7 May 2014 08:52:17 +0000 (18:52 +1000)
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 <a.radke@arcor.de>
Reviewed-by: Daniel Martin <consume.noise@gmail.com>
Tested-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
libevdev/libevdev-uinput.c

index 0543bc4a22084dec13bf81a2887f9c81f16da007..f176a004d6771a7b7c7a944f204e70cf242dc35e 100644 (file)
@@ -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);