Merge pull request #4101 from meffij/SIDevicesEnumFix

clean up bounds checking for SIDEVICE_ENUM
dolphin-emu · Aug 8, 2016 · d56ae50 · d56ae50
2 parents 1ab99ee + ba45a59
commit d56ae50
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp
@@ -287,7 +287,7 @@ bool BootCore(const std::string& _rFilename)
     {
       int source;
       controls_section->Get(StringFromFormat("PadType%u", i), &source, -1);
-      if (source >= (int)SIDEVICE_NONE && source <= (int)SIDEVICE_WIIU_ADAPTER)
+      if (source >= SIDEVICE_NONE && source < SIDEVICE_COUNT)
       {
         SConfig::GetInstance().m_SIDevice[i] = (SIDevices)source;
         config_cache.bSetPads[i] = true;

diff --git a/Source/Core/Core/HW/SI_Device.h b/Source/Core/Core/HW/SI_Device.h
@@ -64,6 +64,8 @@ enum SIDevices : int
   SIDEVICE_GC_TARUKONGA,
   SIDEVICE_AM_BASEBOARD,
   SIDEVICE_WIIU_ADAPTER,
+  // not a valid device, used for checking whether enum value is valid
+  SIDEVICE_COUNT,
 };
 
 class ISIDevice