Fixed NPE in tracker ip addr (#269)

SlimeVR · Nov 14, 2022 · e349440 · e349440
1 parent d8a7fa9
commit e349440
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/main/java/dev/slimevr/protocol/DataFeedBuilder.java b/src/main/java/dev/slimevr/protocol/DataFeedBuilder.java
@@ -43,15 +43,18 @@ public static int createHardwareInfo(FlatBufferBuilder fbb, Device device) {
 		HardwareInfo.startHardwareInfo(fbb);
 		HardwareInfo.addFirmwareVersion(fbb, nameOffset);
 		HardwareInfo.addManufacturer(fbb, manufacturerOffset);
-		HardwareInfo
-			.addIpAddress(
-				fbb,
-				Ipv4Address
-					.createIpv4Address(
-						fbb,
-						ByteBuffer.wrap(device.getIpAddress().getAddress()).getInt()
-					)
-			);
+		var ipAddr = device.getIpAddress();
+		if (ipAddr != null && ipAddr.getAddress() != null) {
+			HardwareInfo
+				.addIpAddress(
+					fbb,
+					Ipv4Address
+						.createIpv4Address(
+							fbb,
+							ByteBuffer.wrap(ipAddr.getAddress()).getInt()
+						)
+				);
+		}
 		// BRUH MOMENT
 		// TODO need support: HardwareInfo.addHardwareRevision(fbb,
 		// hardwareRevisionOffset);