Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for 'libusb_devices were leaked' when no ST-LINK programmer was found #1150

Merged
merged 2 commits into from
Jun 16, 2021
Merged

Fix for 'libusb_devices were leaked' when no ST-LINK programmer was found #1150

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93db93a
fix for 'libusb_devices were leaked' when no stlink was found
gustavolaureano Jun 6, 2021
ca89610
fix for when the device list was not initialized
gustavosilveiragss Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/stlink-lib/usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1203,7 +1203,7 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, enum connect_type connect,
libusb_set_option(slu->libusb_ctx, LIBUSB_OPTION_LOG_LEVEL, ugly_libusb_log_level(verbose));
#endif

libusb_device **list;
libusb_device **list = NULL;
// TODO: We should use ssize_t and use it as a counter if > 0.
// As per libusb API: ssize_t libusb_get_device_list (libusb_context *ctx, libusb_device ***list)
int cnt = (int)libusb_get_device_list(slu->libusb_ctx, &list);
Expand Down Expand Up @@ -1232,7 +1232,7 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, enum connect_type connect,
ILOG("bus %03d dev %03d\n", devBus, devAddr);
}

while (cnt--) {
while (cnt-- > 0) {
struct libusb_device_handle *handle;

libusb_get_device_descriptor(list[cnt], &desc);
Expand Down Expand Up @@ -1273,6 +1273,7 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, enum connect_type connect,

if (cnt < 0) {
WLOG ("Couldn't find %s ST-Link devices\n", (devBus && devAddr) ? "matched" : "any");
libusb_free_device_list(list, 1);
Nightwalker-87 marked this conversation as resolved.
Show resolved Hide resolved
goto on_error;
} else {
ret = libusb_open(list[cnt], &slu->usb_handle);
Expand Down