piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 05:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon: improve code that returns a controller attachment index

Browse Source 
casting a value to a u32 when it's originally an int, and it's exposed as int to users,
could end up in cases where a negative number would result as a positive one.
This doesn't really affect the value range of the attachment enum,
still I think the code was wrong.

Heavily tested.
This commit is contained in:
Filoppi
2021-05-05 00:01:20 +03:00
parent d43a06ff6a
commit a19a0096db
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/InputCommon/ControllerEmu/ControlGroup/Attachments.cpp
View File

@ -17,10 +17,11 @@ void Attachments::AddAttachment(std::unique_ptr<EmulatedController> att)
u32 Attachments::GetSelectedAttachment() const u32 Attachments::GetSelectedAttachment() const
{ {
const u32 value = m_selection_value.GetValue(); // This is originally an int, treat it as such
const int value = m_selection_value.GetValue();
if (value < m_attachments.size()) if (value > 0 && static_cast<size_t>(value) < m_attachments.size())
return value; return u32(value);
return 0; return 0;
} }