RPCS3/hidapi
1
0
Fork 0
mirror of https://github.com/RPCS3/hidapi.git synced 2026-07-19 13:34:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible garbage in device strings returned from hid_enumerate()

Browse Source 
In some cases HidD_GetSerialNumberString/HidD_GetManufacturerString/HidD_GetProductString can fail.
For example if we have Bluetooth LE gamepad on Windows.
In this case we are currently returning not initialized strings in `hid_device_info`.
This commit is contained in:
Dimitriy Ryazantcev
2021-07-07 15:29:59 +03:00
committed by Ihor Dutchak
parent 382138ee67
commit 5a88dcd7ab
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows/hid.c
+11 -17
View File
@@ -207,8 +207,8 @@ static void register_error(hid_device *dev, const char *op)
end of the message. Thanks Microsoft! */
ptr = msg;
while (*ptr) {
if (*ptr == '\r') {
*ptr = 0x0000;
if (*ptr == L'\r') {
*ptr = L'\0';
break;
}
ptr++;
@@ -463,28 +463,22 @@ struct hid_device_info HID_API_EXPORT * HID_API_CALL hid_enumerate(unsigned shor
cur_dev->path = NULL;
/* Serial Number */
wstr[0]= 0x0000;
wstr[0]= L'\0';
res = HidD_GetSerialNumberString(write_handle, wstr, sizeof(wstr));
wstr[WSTR_LEN-1] = 0x0000;
if (res) {
cur_dev->serial_number = _wcsdup(wstr);
}
wstr[WSTR_LEN-1] = L'\0';
cur_dev->serial_number = _wcsdup(wstr);
/* Manufacturer String */
wstr[0]= 0x0000;
wstr[0]= L'\0';
res = HidD_GetManufacturerString(write_handle, wstr, sizeof(wstr));
wstr[WSTR_LEN-1] = 0x0000;
if (res) {
cur_dev->manufacturer_string = _wcsdup(wstr);
}
wstr[WSTR_LEN-1] = L'\0';
cur_dev->manufacturer_string = _wcsdup(wstr);
/* Product String */
wstr[0]= 0x0000;
wstr[0]= L'\0';
res = HidD_GetProductString(write_handle, wstr, sizeof(wstr));
wstr[WSTR_LEN-1] = 0x0000;
if (res) {
cur_dev->product_string = _wcsdup(wstr);
}
wstr[WSTR_LEN-1] = L'\0';
cur_dev->product_string = _wcsdup(wstr);
/* VID/PID */
cur_dev->vendor_id = attrib.VendorID;