Skip to content

pg2-util: don't try to libusb_ref_device a null pointer if hotplug fails #3

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

Merged
mutability merged 1 commit into from
Sep 30, 2026
Merged

pg2-util: don't try to libusb_ref_device a null pointer if hotplug fails #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cli/pg2-util/dfu_load.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ bool dfu_load(const firmware_image_t *image, libusb_device *dev, libusb_device *
/* wait for the new device to appear */
post_hotplug = hotplug_await(hotplug_state);
if (loaded_device)
*loaded_device = libusb_ref_device(post_hotplug);
*loaded_device = post_hotplug ? libusb_ref_device(post_hotplug) : NULL;

cleanup:
if (handle)
Expand Down
2 changes: 1 addition & 1 deletion cli/pg2-util/mem_load.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ bool mem_load(const firmware_image_t *image, libusb_device *dev, libusb_device *
/* wait for the new device to appear */
post_hotplug = hotplug_await(hotplug_state);
if (loaded_device)
*loaded_device = libusb_ref_device(post_hotplug);
*loaded_device = post_hotplug ? libusb_ref_device(post_hotplug) : NULL;

cleanup:
if (handle)
Expand Down
Loading