libusb: Early out if cur_dev is null

Megamouse · Megamouse · commit 0346fc674ed1 · 2024-09-27T14:15:56.000+02:00
diff --git a/libusb/hid.c b/libusb/hid.c
@@ -548,6 +548,9 @@ static int hid_get_report_descriptor_libusb(libusb_device_handle *handle, int in
  */
 static void fill_device_info_usage(struct hid_device_info *cur_dev, libusb_device_handle *handle, int interface_num, uint16_t expected_report_descriptor_size)
 {
+	if (!cur_dev)
+		return;
+
 	unsigned char hid_report_descriptor[HID_API_MAX_REPORT_DESCRIPTOR_SIZE];
 	unsigned short page = 0, usage = 0;
 
@@ -558,10 +561,8 @@ static void fill_device_info_usage(struct hid_device_info *cur_dev, libusb_devic
 		get_usage(hid_report_descriptor, res,  &page, &usage);
 	}
 
-	if (cur_dev) {
-		cur_dev->usage_page = page;
-		cur_dev->usage = usage;
-	}
+	cur_dev->usage_page = page;
+	cur_dev->usage = usage;
 }
 
 #ifdef INVASIVE_GET_USAGE

Original file line number	Diff line number	Diff line change
`@@ -548,6 +548,9 @@ static int hid_get_report_descriptor_libusb(libusb_device_handle *handle, int in`
`548`	`548`	`*/`
`549`	`549`	`static void fill_device_info_usage(struct hid_device_info cur_dev, libusb_device_handle handle, int interface_num, uint16_t expected_report_descriptor_size)`
`550`	`550`	`{`
	`551`	`+ if (!cur_dev)`
	`552`	`+ return;`
	`553`	`+`
`551`	`554`	`unsigned char hid_report_descriptor[HID_API_MAX_REPORT_DESCRIPTOR_SIZE];`
`552`	`555`	`unsigned short page = 0, usage = 0;`
`553`	`556`
`@@ -558,10 +561,8 @@ static void fill_device_info_usage(struct hid_device_info *cur_dev, libusb_devic`
`558`	`561`	`get_usage(hid_report_descriptor, res, &page, &usage);`
`559`	`562`	`}`
`560`	`563`
`561`		`- if (cur_dev) {`
`562`		`- cur_dev->usage_page = page;`
`563`		`- cur_dev->usage = usage;`
`564`		`- }`
	`564`	`+ cur_dev->usage_page = page;`
	`565`	`+ cur_dev->usage = usage;`
`565`	`566`	`}`
`566`	`567`
`567`	`568`	`#ifdef INVASIVE_GET_USAGE`