RPCS3/libusb
1
0
Fork 0
mirror of https://github.com/RPCS3/libusb.git synced 2026-07-18 18:24:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix leak in failure path of libusb_get_max_packet_size()

Browse Source 
If libusb_get_max_packet_size() or libusb_get_max_iso_packet_size()
fails to find the endpoint, it leaks the configuration descriptor.  Fix
this.

Signed-off-by: John Sheu <sheu@google.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
John Sheu
2014-06-10 15:09:06 -07:00
committed by Hans de Goede
parent e6902b2b0f
commit cdf3c36ea1
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libusb/core.c
+13 -5
View File
@@ -899,10 +899,14 @@ int API_EXPORTED libusb_get_max_packet_size(libusb_device *dev,
}
ep = find_endpoint(config, endpoint);
if (!ep)
return LIBUSB_ERROR_NOT_FOUND;
if (!ep) {
r = LIBUSB_ERROR_NOT_FOUND;
goto out;
}
r = ep->wMaxPacketSize;
out:
libusb_free_config_descriptor(config);
return r;
}
@@ -950,17 +954,21 @@ int API_EXPORTED libusb_get_max_iso_packet_size(libusb_device *dev,
}
ep = find_endpoint(config, endpoint);
if (!ep)
return LIBUSB_ERROR_NOT_FOUND;
if (!ep) {
r = LIBUSB_ERROR_NOT_FOUND;
goto out;
}
val = ep->wMaxPacketSize;
ep_type = (enum libusb_transfer_type) (ep->bmAttributes & 0x3);
libusb_free_config_descriptor(config);
r = val & 0x07ff;
if (ep_type == LIBUSB_TRANSFER_TYPE_ISOCHRONOUS
|| ep_type == LIBUSB_TRANSFER_TYPE_INTERRUPT)
r *= (1 + ((val >> 11) & 3));
out:
libusb_free_config_descriptor(config);
return r;
}