Check deviceIndex is valid in currentControlScheme

tspiller · tspiller · commit 4dccfbf2e154 · 2024-11-19T09:59:51.000Z
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -691,7 +691,7 @@ private static bool ShouldBindingBeVisible(SerializedInputBinding serializedInpu
             if (currentControlScheme.HasValue && !string.IsNullOrEmpty(currentControlScheme.Value.name))
             {
                 var isMatchingDevice = true;
-                if (deviceIndex >= 0)
+                if (deviceIndex >= 0 && deviceIndex < currentControlScheme.Value.deviceRequirements.Count)
                 {
                     var devicePathToMatch = InputControlPath.TryGetDeviceLayout(currentControlScheme.Value.deviceRequirements.ElementAt(deviceIndex).controlPath);
                     var devicePath = InputControlPath.TryGetDeviceLayout(serializedInputBinding.path);

Original file line number	Diff line number	Diff line change
`@@ -691,7 +691,7 @@ private static bool ShouldBindingBeVisible(SerializedInputBinding serializedInpu`
`691`	`691`	`if (currentControlScheme.HasValue && !string.IsNullOrEmpty(currentControlScheme.Value.name))`
`692`	`692`	`{`
`693`	`693`	`var isMatchingDevice = true;`
`694`		`- if (deviceIndex >= 0)`
	`694`	`+ if (deviceIndex >= 0 && deviceIndex < currentControlScheme.Value.deviceRequirements.Count)`
`695`	`695`	`{`
`696`	`696`	`var devicePathToMatch = InputControlPath.TryGetDeviceLayout(currentControlScheme.Value.deviceRequirements.ElementAt(deviceIndex).controlPath);`
`697`	`697`	`var devicePath = InputControlPath.TryGetDeviceLayout(serializedInputBinding.path);`