i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freebsd_network: Add missing NULL check in get_usb_device_attach_arg.

Browse Source 
May fix #18418.
This commit is contained in:
Augustin Cavalier
2023-05-22 19:23:04 -04:00
parent 605bd3f09d
commit bcc72455d3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/compat/freebsd_network/usb.cpp
+4 -2
View File
@@ -121,7 +121,7 @@ get_usb_device_attach_arg(struct freebsd_usb_device* device, struct usb_attach_a
const usb_device_descriptor* device_desc = const usb_device_descriptor* device_desc =
sUSB->get_device_descriptor(device->haiku_usb_device); sUSB->get_device_descriptor(device->haiku_usb_device);
if (!device_desc) if (device_desc == NULL)
return B_BAD_VALUE; return B_BAD_VALUE;
uaa->info.idVendor = device_desc->vendor_id; uaa->info.idVendor = device_desc->vendor_id;
@@ -132,11 +132,13 @@ get_usb_device_attach_arg(struct freebsd_usb_device* device, struct usb_attach_a
uaa->info.bDeviceProtocol = device_desc->device_protocol; uaa->info.bDeviceProtocol = device_desc->device_protocol;
const usb_configuration_info* config = sUSB->get_configuration(device->haiku_usb_device); const usb_configuration_info* config = sUSB->get_configuration(device->haiku_usb_device);
if (!device_desc) if (device_desc == NULL)
return B_BAD_VALUE; return B_BAD_VALUE;
// TODO: represent more than just interface[0], but how? // TODO: represent more than just interface[0], but how?
usb_interface_info* iface = config->interface[0].active; usb_interface_info* iface = config->interface[0].active;
if (iface == NULL)
return B_NO_INIT;
uaa->info.bInterfaceClass = iface->descr->interface_class; uaa->info.bInterfaceClass = iface->descr->interface_class;
uaa->info.bInterfaceSubClass = iface->descr->interface_subclass; uaa->info.bInterfaceSubClass = iface->descr->interface_subclass;