Fix NPE if USB device descriptor cannot be fetched

MisterTechnik · May 14, 2024 · 8ce0610 · 8ce0610
1 parent 5d05545
commit 8ce0610
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/src/main/java/org/cgutman/usbip/service/UsbIpService.java b/app/src/main/java/org/cgutman/usbip/service/UsbIpService.java
@@ -364,8 +364,9 @@ private UsbDeviceInfo getInfoForDevice(UsbDevice dev, UsbDeviceConnection devCon
 			// Since we're attached already, we can directly query the USB descriptors
 			// to fill some information that Android's USB API doesn't expose
 			devDesc = UsbControlHelper.readDeviceDescriptor(context.devConn);
-
-			ipDev.bcdDevice = devDesc.bcdDevice;
+			if (devDesc != null) {
+				ipDev.bcdDevice = devDesc.bcdDevice;
+			}
 		}
 
 		ipDev.speed = detectSpeed(dev, devDesc);