From de4e5db3300cc77694ff154cf3e8a3ba9c9eaf78 Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Fri, 24 Feb 2023 12:29:55 -0500
Subject: hid: avoid direct pointer access of transfer memory objects

---
 src/core/hle/service/hid/irs.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/core/hle/service/hid/irs.h')

diff --git a/src/core/hle/service/hid/irs.h b/src/core/hle/service/hid/irs.h
index 2e6115c73..b76ad7854 100644
--- a/src/core/hle/service/hid/irs.h
+++ b/src/core/hle/service/hid/irs.h
@@ -80,7 +80,13 @@ private:
             LOG_CRITICAL(Service_IRS, "Invalid index {}", index);
             return;
         }
-        processors[index] = std::make_unique<T>(system.HIDCore(), device_state, index);
+
+        if constexpr (std::is_constructible_v<T, Core::System&, Core::IrSensor::DeviceFormat&,
+                                              std::size_t>) {
+            processors[index] = std::make_unique<T>(system, device_state, index);
+        } else {
+            processors[index] = std::make_unique<T>(system.HIDCore(), device_state, index);
+        }
     }
 
     template <typename T>
-- 
cgit v1.2.3