guard bad values in GetBindingIndexBeforeAction

smnwttbr · smnwttbr · commit 3e30ddabcc2d · 2024-11-06T13:33:44.000+08:00
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
@@ -114,7 +114,12 @@ public static int GetSelectedBindingIndexAfterCompositeBindings(InputActionsEdit
 
         public static int GetBindingIndexBeforeAction(SerializedProperty arrayProperty, int indexToInsert, SerializedProperty bindingArrayToInsertTo)
         {
-            Debug.Assert(indexToInsert >= 0 && indexToInsert <= arrayProperty.arraySize, "Invalid action index to insert bindings before.");
+            // Need to guard against this case, as there is different behaviour when pasting actions vs actionmaps
+            if (indexToInsert < 0)
+            {
+                return -1;
+            }
+            Debug.Assert(indexToInsert <= arrayProperty.arraySize, "Invalid action index to insert bindings before.");
             var offset = 1; //previous action offset
             while (indexToInsert - offset >= 0)
             {

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,12 @@ public static int GetSelectedBindingIndexAfterCompositeBindings(InputActionsEdit`
`114`	`114`
`115`	`115`	`public static int GetBindingIndexBeforeAction(SerializedProperty arrayProperty, int indexToInsert, SerializedProperty bindingArrayToInsertTo)`
`116`	`116`	`{`
`117`		`- Debug.Assert(indexToInsert >= 0 && indexToInsert <= arrayProperty.arraySize, "Invalid action index to insert bindings before.");`
	`117`	`+ // Need to guard against this case, as there is different behaviour when pasting actions vs actionmaps`
	`118`	`+ if (indexToInsert < 0)`
	`119`	`+ {`
	`120`	`+ return -1;`
	`121`	`+ }`
	`122`	`+ Debug.Assert(indexToInsert <= arrayProperty.arraySize, "Invalid action index to insert bindings before.");`
`118`	`123`	`var offset = 1; //previous action offset`
`119`	`124`	`while (indexToInsert - offset >= 0)`
`120`	`125`	`{`