Merge pull request #12203 from deReeperJosh/hidv4-check-device-not-null

HIDv4: Check Device Not Null Before Attaching
dolphin-emu · Sep 27, 2023 · 467c743 · 467c743
2 parents f844578 + d0de837
commit 467c743
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Source/Core/Core/IOS/USB/USB_HID/HIDv4.cpp b/Source/Core/Core/IOS/USB/USB_HID/HIDv4.cpp
@@ -59,6 +59,8 @@ std::optional<IPCReply> USB_HIDv4::IOCtl(const IOCtlRequest& request)
     if (request.buffer_in == 0 || request.buffer_in_size != 32)
       return IPCReply(IPC_EINVAL);
     const auto device = GetDeviceByIOSID(memory.Read_U32(request.buffer_in + 16));
+    if (!device)
+      return IPCReply(IPC_ENOENT);
     if (!device->Attach())
       return IPCReply(IPC_EINVAL);
     return HandleTransfer(device, request.request,