summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-03-30 03:00:47 +0200
committerGitHub <noreply@github.com>2021-03-30 03:00:47 +0200
commitf234531f92bab2e35fd88594c61943777ff44677 (patch)
treec3933a963b8c0bccc6fe60522c602a02054e8601 /src/core
parentMerge pull request #6102 from ogniK5377/fd-pass (diff)
parentHID: Initialize correctly the gesture finger_id and filter invalid results (diff)
downloadyuzu-f234531f92bab2e35fd88594c61943777ff44677.tar
yuzu-f234531f92bab2e35fd88594c61943777ff44677.tar.gz
yuzu-f234531f92bab2e35fd88594c61943777ff44677.tar.bz2
yuzu-f234531f92bab2e35fd88594c61943777ff44677.tar.lz
yuzu-f234531f92bab2e35fd88594c61943777ff44677.tar.xz
yuzu-f234531f92bab2e35fd88594c61943777ff44677.tar.zst
yuzu-f234531f92bab2e35fd88594c61943777ff44677.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/hid/controllers/gesture.cpp11
-rw-r--r--src/core/hle/service/hid/controllers/touchscreen.cpp5
2 files changed, 13 insertions, 3 deletions
diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/core/hle/service/hid/controllers/gesture.cpp
index e7063f8ef..93c43a203 100644
--- a/src/core/hle/service/hid/controllers/gesture.cpp
+++ b/src/core/hle/service/hid/controllers/gesture.cpp
@@ -4,6 +4,7 @@
#include <cstring>
#include "common/common_types.h"
+#include "common/logging/log.h"
#include "core/core_timing.h"
#include "core/frontend/emu_window.h"
#include "core/hle/service/hid/controllers/gesture.h"
@@ -19,9 +20,9 @@ Controller_Gesture::~Controller_Gesture() = default;
void Controller_Gesture::OnInit() {
for (std::size_t id = 0; id < MAX_FINGERS; ++id) {
- mouse_finger_id[id] = MAX_FINGERS;
- keyboard_finger_id[id] = MAX_FINGERS;
- udp_finger_id[id] = MAX_FINGERS;
+ mouse_finger_id[id] = MAX_POINTS;
+ keyboard_finger_id[id] = MAX_POINTS;
+ udp_finger_id[id] = MAX_POINTS;
}
}
@@ -142,6 +143,10 @@ std::optional<std::size_t> Controller_Gesture::GetUnusedFingerID() const {
std::size_t Controller_Gesture::UpdateTouchInputEvent(
const std::tuple<float, float, bool>& touch_input, std::size_t finger_id) {
const auto& [x, y, pressed] = touch_input;
+ if (finger_id > MAX_POINTS) {
+ LOG_ERROR(Service_HID, "Invalid finger id {}", finger_id);
+ return MAX_POINTS;
+ }
if (pressed) {
if (finger_id == MAX_POINTS) {
const auto first_free_id = GetUnusedFingerID();
diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/core/hle/service/hid/controllers/touchscreen.cpp
index 5219f2dad..be60492a4 100644
--- a/src/core/hle/service/hid/controllers/touchscreen.cpp
+++ b/src/core/hle/service/hid/controllers/touchscreen.cpp
@@ -5,6 +5,7 @@
#include <algorithm>
#include <cstring>
#include "common/common_types.h"
+#include "common/logging/log.h"
#include "core/core_timing.h"
#include "core/frontend/emu_window.h"
#include "core/frontend/input.h"
@@ -118,6 +119,10 @@ std::optional<std::size_t> Controller_Touchscreen::GetUnusedFingerID() const {
std::size_t Controller_Touchscreen::UpdateTouchInputEvent(
const std::tuple<float, float, bool>& touch_input, std::size_t finger_id) {
const auto& [x, y, pressed] = touch_input;
+ if (finger_id > MAX_FINGERS) {
+ LOG_ERROR(Service_HID, "Invalid finger id {}", finger_id);
+ return MAX_FINGERS;
+ }
if (pressed) {
Attributes attribute{};
if (finger_id == MAX_FINGERS) {