diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2013-05-16 21:30:42 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2013-05-16 21:54:22 +0200 |
| commit | 34e5d1888f6b7a110b6e4854825a61bef9ac3e6b (patch) | |
| tree | 4b7b539400e493c86760ba0a10421b835fac1dc2 | |
| parent | 972e9cde6e93796731871fa758b26c11a6621195 (diff) | |
| download | libusb-34e5d1888f6b7a110b6e4854825a61bef9ac3e6b.tar.gz | |
linux_udev: linux_start_event_monitor: Properly cleanup on error
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | libusb/os/linux_udev.c | 21 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 18 insertions, 5 deletions
diff --git a/libusb/os/linux_udev.c b/libusb/os/linux_udev.c index 86007f8..9045c2e 100644 --- a/libusb/os/linux_udev.c +++ b/libusb/os/linux_udev.c @@ -66,25 +66,38 @@ int linux_udev_start_event_monitor(void) udev_monitor = udev_monitor_new_from_netlink(udev_ctx, "udev"); if (!udev_monitor) { usbi_err(NULL, "could not initialize udev monitor"); - return LIBUSB_ERROR_OTHER; + goto err_free_ctx; } r = udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, "usb", 0); if (r) { usbi_err(NULL, "could not initialize udev monitor filter for \"usb\" subsystem"); - return LIBUSB_ERROR_OTHER; + goto err_free_monitor; } if (udev_monitor_enable_receiving(udev_monitor)) { usbi_err(NULL, "failed to enable the udev monitor"); - return LIBUSB_ERROR_OTHER; + goto err_free_monitor; } udev_monitor_fd = udev_monitor_get_fd(udev_monitor); - pthread_create(&linux_event_thread, NULL, linux_udev_event_thread_main, NULL); + r = pthread_create(&linux_event_thread, NULL, linux_udev_event_thread_main, NULL); + if (r) { + usbi_err(NULL, "could not create linux hotplug event thread"); + goto err_free_monitor; + } return LIBUSB_SUCCESS; + +err_free_monitor: + udev_monitor_unref(udev_monitor); + udev_monitor = NULL; + udev_monitor_fd = -1; +err_free_ctx: + udev_unref(udev_ctx); + udev_ctx = NULL; + return LIBUSB_ERROR_OTHER; } int linux_udev_stop_event_monitor(void) diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 815a218..7391d65 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10687 +#define LIBUSB_NANO 10688 |