Page MenuHomeFreeBSD
Files F145237054

D11494.diff
No OneTemporary
Actions

D11494.diff
View Options

Index: head/lib/libusb/libusb.h
===================================================================
--- head/lib/libusb/libusb.h
+++ head/lib/libusb/libusb.h
@@ -388,6 +388,7 @@
uint8_t bNumDeviceCapabilities;
struct libusb_usb_2_0_device_capability_descriptor *usb_2_0_ext_cap;
struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap;
+ struct libusb_bos_dev_capability_descriptor **dev_capability;
} libusb_bos_descriptor __aligned(sizeof(void *));
typedef struct libusb_usb_2_0_extension_descriptor {
Index: head/lib/libusb/libusb10_desc.c
===================================================================
--- head/lib/libusb/libusb10_desc.c
+++ head/lib/libusb/libusb10_desc.c
@@ -433,6 +433,7 @@
struct libusb_bos_descriptor *ptr;
struct libusb_usb_2_0_device_capability_descriptor *dcap_20 = NULL;
struct libusb_ss_usb_device_capability_descriptor *ss_cap = NULL;
+ uint8_t index = 0;
if (buf == NULL || bos == NULL || len < 1)
return (LIBUSB_ERROR_INVALID_PARAM);
@@ -453,7 +454,8 @@
break;
if (dlen >= LIBUSB_DT_BOS_SIZE &&
- dtype == LIBUSB_DT_BOS) {
+ dtype == LIBUSB_DT_BOS &&
+ ptr == NULL) {
ptr = malloc(sizeof(*ptr) + sizeof(*dcap_20) +
sizeof(*ss_cap));
@@ -470,6 +472,11 @@
ptr->bNumDeviceCapabilities = ((const uint8_t *)buf)[4];
ptr->usb_2_0_ext_cap = NULL;
ptr->ss_usb_cap = NULL;
+ ptr->dev_capability = calloc(ptr->bNumDeviceCapabilities, sizeof(void *));
+ if (ptr->dev_capability == NULL) {
+ free(ptr);
+ return (LIBUSB_ERROR_NO_MEM);
+ }
dcap_20 = (void *)(ptr + 1);
ss_cap = (void *)(dcap_20 + 1);
@@ -477,6 +484,15 @@
if (dlen >= 3 &&
ptr != NULL &&
dtype == LIBUSB_DT_DEVICE_CAPABILITY) {
+ if (index != ptr->bNumDeviceCapabilities) {
+ ptr->dev_capability[index] = malloc(dlen);
+ if (ptr->dev_capability[index] == NULL) {
+ libusb_free_bos_descriptor(ptr);
+ return LIBUSB_ERROR_NO_MEM;
+ }
+ memcpy(ptr->dev_capability[index], buf, dlen);
+ index++;
+ }
switch (((const uint8_t *)buf)[2]) {
case LIBUSB_USB_2_0_EXTENSION_DEVICE_CAPABILITY:
if (ptr->usb_2_0_ext_cap != NULL || dcap_20 == NULL)
@@ -523,8 +539,11 @@
buf = ((const uint8_t *)buf) + dlen;
len -= dlen;
}
- if (ptr != NULL)
+
+ if (ptr != NULL) {
+ ptr->bNumDeviceCapabilities = index;
return (0); /* success */
+ }
return (LIBUSB_ERROR_IO);
}
@@ -532,9 +551,14 @@
void
libusb_free_bos_descriptor(struct libusb_bos_descriptor *bos)
{
+ uint8_t i;
+
if (bos == NULL)
return;
+ for (i = 0; i != bos->bNumDeviceCapabilities; i++)
+ free(bos->dev_capability[i]);
+ free(bos->dev_capability);
free(bos);
}

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 18, 10:48 AM (15 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28845159
Default Alt Text
D11494.diff (2 KB)

Event Timeline