aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-11-03 09:14:17 -0400
committerGitHub <noreply@github.com>2023-11-03 09:14:17 -0400
commiteda403388af14b55d56753b4f887fadec129522c (patch)
tree6bd78480d54fa0a8198fca583ed18e0962f0cbad
parent3032980478e6d633ceee758fa10e194378c1a531 (diff)
parentb36fec486e063fc16c50346179bd8e1cb26ee177 (diff)
Merge pull request #11948 from german77/hard_ring
service: hid: Ensure GetNextEntryIndex can't fail
-rw-r--r--src/core/hle/service/hid/ring_lifo.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/hid/ring_lifo.h b/src/core/hle/service/hid/ring_lifo.h
index 65eb7ea02e..0816784e08 100644
--- a/src/core/hle/service/hid/ring_lifo.h
+++ b/src/core/hle/service/hid/ring_lifo.h
@@ -32,15 +32,15 @@ struct Lifo {
}
std::size_t GetPreviousEntryIndex() const {
- return static_cast<size_t>((buffer_tail + total_buffer_count - 1) % total_buffer_count);
+ return static_cast<size_t>((buffer_tail + max_buffer_size - 1) % max_buffer_size);
}
std::size_t GetNextEntryIndex() const {
- return static_cast<size_t>((buffer_tail + 1) % total_buffer_count);
+ return static_cast<size_t>((buffer_tail + 1) % max_buffer_size);
}
void WriteNextEntry(const State& new_state) {
- if (buffer_count < total_buffer_count - 1) {
+ if (buffer_count < static_cast<s64>(max_buffer_size) - 1) {
buffer_count++;
}
buffer_tail = GetNextEntryIndex();