diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-03-05 00:13:51 +0000 |
|---|---|---|
| committer | Pete Batard <pbatard@gmail.com> | 2010-03-05 00:13:51 +0000 |
| commit | 842c719c2f21920b6af33035fb5280eea2c1efe6 (patch) | |
| tree | bde297ed6e4e860c104df4f62190d3a429f47819 | |
| parent | 51509cff245badf79710faed11cdfc585862c222 (diff) | |
| download | libusb-842c719c2f21920b6af33035fb5280eea2c1efe6.tar.gz | |
fixed unref of devices that already exist (Travis Robinson)r194
| -rw-r--r-- | libusb/os/windows_usb.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c index b3d7743..5b0ae89 100644 --- a/libusb/os/windows_usb.c +++ b/libusb/os/windows_usb.c @@ -759,7 +759,7 @@ static int usb_enumerate_hub(struct libusb_context *ctx, struct discovered_devs USB_HUB_NAME_FIXED s_hubname; USB_NODE_CONNECTION_INFORMATION conn_info; USB_NODE_INFORMATION hub_node; - bool is_hcd; + bool is_hcd, need_unref = false; int i, r; LPCWSTR wstr; char *tmp_str = NULL, *path_str = NULL; @@ -792,7 +792,10 @@ static int usb_enumerate_hub(struct libusb_context *ctx, struct discovered_devs for (i = 1, r = LIBUSB_SUCCESS; ; i++) { // safe loop: release all dynamic resources - safe_unref_device(dev); + if (need_unref) { + safe_unref_device(dev); + need_unref = false; + } safe_free(tmp_str); safe_free(path_str); safe_closehandle(handle); @@ -906,6 +909,7 @@ static int usb_enumerate_hub(struct libusb_context *ctx, struct discovered_devs if ((dev = usbi_alloc_device(ctx, session_id)) == NULL) { LOOP_BREAK(LIBUSB_ERROR_NO_MEM); } + need_unref = true; LOOP_CHECK(initialize_device(dev, busnum, devaddr, path_str, i, conn_info.CurrentConfigurationValue, parent_dev)); |