Merge pull request bugst#153 from cmaglie/fix_windows_enumerator

windows: Avoid panic if USB Product name is empty
quite · Jan 3, 2023 · e381f2c · e381f2c
2 parents 0c6a048 + e6cff1a
commit e381f2c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/enumerator/usb_windows.go b/enumerator/usb_windows.go
@@ -347,10 +347,12 @@ func retrievePortDetailsFromDevInfo(device *deviceInfo, details *PortDetails) er
 		the result of spdrpFriendlyName is therefore unique and suitable as an alternative string to for a port choice */
 	n := uint32(0)
 	setupDiGetDeviceRegistryProperty(device.set, &device.data, spdrpFriendlyName /* spdrpDeviceDesc */, nil, nil, 0, &n)
-	buff := make([]uint16, n*2)
-	buffP := (*byte)(unsafe.Pointer(&buff[0]))
-	if setupDiGetDeviceRegistryProperty(device.set, &device.data, spdrpFriendlyName /* spdrpDeviceDesc */, nil, buffP, n, &n) {
-		details.Product = syscall.UTF16ToString(buff[:])
+	if n > 0 {
+		buff := make([]uint16, n*2)
+		buffP := (*byte)(unsafe.Pointer(&buff[0]))
+		if setupDiGetDeviceRegistryProperty(device.set, &device.data, spdrpFriendlyName /* spdrpDeviceDesc */, nil, buffP, n, &n) {
+			details.Product = syscall.UTF16ToString(buff[:])
+		}
 	}
 
 	return nil