From f01dac3bf934657059b77bae3630201110f83e3d Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Sun, 24 Oct 2021 20:27:00 -0500
Subject: service/hid: Fix memory allocated incorrectly

---
 src/core/hle/service/hid/controllers/debug_pad.cpp | 6 +++---
 src/core/hle/service/hid/controllers/gesture.cpp   | 2 +-
 src/core/hle/service/hid/controllers/keyboard.cpp  | 2 +-
 src/core/hle/service/hid/controllers/mouse.cpp     | 2 +-
 src/core/hle/service/hid/controllers/xpad.cpp      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/core')

diff --git a/src/core/hle/service/hid/controllers/debug_pad.cpp b/src/core/hle/service/hid/controllers/debug_pad.cpp
index b2b4edf51..5b1946f13 100644
--- a/src/core/hle/service/hid/controllers/debug_pad.cpp
+++ b/src/core/hle/service/hid/controllers/debug_pad.cpp
@@ -12,7 +12,7 @@
 #include "core/hle/service/hid/controllers/debug_pad.h"
 
 namespace Service::HID {
-
+constexpr std::size_t SHARED_MEMORY_OFFSET = 0x00000;
 constexpr s32 HID_JOYSTICK_MAX = 0x7fff;
 [[maybe_unused]] constexpr s32 HID_JOYSTICK_MIN = -0x7fff;
 enum class JoystickId : std::size_t { Joystick_Left, Joystick_Right };
@@ -32,7 +32,7 @@ void Controller_DebugPad::OnUpdate(const Core::Timing::CoreTiming& core_timing,
     if (!IsControllerActivated()) {
         debug_pad_lifo.entry_count = 0;
         debug_pad_lifo.last_entry_index = 0;
-        std::memcpy(data, &debug_pad_lifo, sizeof(debug_pad_lifo));
+        std::memcpy(data + SHARED_MEMORY_OFFSET, &debug_pad_lifo, sizeof(debug_pad_lifo));
         return;
     }
 
@@ -51,7 +51,7 @@ void Controller_DebugPad::OnUpdate(const Core::Timing::CoreTiming& core_timing,
     }
 
     debug_pad_lifo.WriteNextEntry(next_state);
-    std::memcpy(data, &debug_pad_lifo, sizeof(debug_pad_lifo));
+    std::memcpy(data + SHARED_MEMORY_OFFSET, &debug_pad_lifo, sizeof(debug_pad_lifo));
 }
 
 } // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/core/hle/service/hid/controllers/gesture.cpp
index 7a7bc68a2..47760b4f8 100644
--- a/src/core/hle/service/hid/controllers/gesture.cpp
+++ b/src/core/hle/service/hid/controllers/gesture.cpp
@@ -43,7 +43,7 @@ void Controller_Gesture::OnUpdate(const Core::Timing::CoreTiming& core_timing, u
     if (!IsControllerActivated()) {
         gesture_lifo.entry_count = 0;
         gesture_lifo.last_entry_index = 0;
-        std::memcpy(data, &gesture_lifo, sizeof(gesture_lifo));
+        std::memcpy(data + SHARED_MEMORY_OFFSET, &gesture_lifo, sizeof(gesture_lifo));
         return;
     }
 
diff --git a/src/core/hle/service/hid/controllers/keyboard.cpp b/src/core/hle/service/hid/controllers/keyboard.cpp
index db0f56b92..632679a17 100644
--- a/src/core/hle/service/hid/controllers/keyboard.cpp
+++ b/src/core/hle/service/hid/controllers/keyboard.cpp
@@ -29,7 +29,7 @@ void Controller_Keyboard::OnUpdate(const Core::Timing::CoreTiming& core_timing,
     if (!IsControllerActivated()) {
         keyboard_lifo.entry_count = 0;
         keyboard_lifo.last_entry_index = 0;
-        std::memcpy(data, &keyboard_lifo, sizeof(keyboard_lifo));
+        std::memcpy(data + SHARED_MEMORY_OFFSET, &keyboard_lifo, sizeof(keyboard_lifo));
         return;
     }
 
diff --git a/src/core/hle/service/hid/controllers/mouse.cpp b/src/core/hle/service/hid/controllers/mouse.cpp
index 2f607bfe9..6d3bd0a2b 100644
--- a/src/core/hle/service/hid/controllers/mouse.cpp
+++ b/src/core/hle/service/hid/controllers/mouse.cpp
@@ -29,7 +29,7 @@ void Controller_Mouse::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
     if (!IsControllerActivated()) {
         mouse_lifo.entry_count = 0;
         mouse_lifo.last_entry_index = 0;
-        std::memcpy(data, &mouse_lifo, sizeof(mouse_lifo));
+        std::memcpy(data + SHARED_MEMORY_OFFSET, &mouse_lifo, sizeof(mouse_lifo));
         return;
     }
 
diff --git a/src/core/hle/service/hid/controllers/xpad.cpp b/src/core/hle/service/hid/controllers/xpad.cpp
index 29a412ff9..aa9f044f1 100644
--- a/src/core/hle/service/hid/controllers/xpad.cpp
+++ b/src/core/hle/service/hid/controllers/xpad.cpp
@@ -22,7 +22,7 @@ void Controller_XPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
     if (!IsControllerActivated()) {
         basic_xpad_lifo.entry_count = 0;
         basic_xpad_lifo.last_entry_index = 0;
-        std::memcpy(data, &basic_xpad_lifo, sizeof(basic_xpad_lifo));
+        std::memcpy(data + SHARED_MEMORY_OFFSET, &basic_xpad_lifo, sizeof(basic_xpad_lifo));
         return;
     }
 
-- 
cgit v1.2.3