Merge pull request #8803 from prefrontalcortex/sanitize-dataprovider-array-access

David Kline · web-flow · commit b08c584fb013 · 2020-10-15T16:29:28.000-07:00
Sanitize data provider array access
diff --git a/Assets/MRTK/Core/Inspectors/Profiles/DataProviderAccessServiceInspector.cs b/Assets/MRTK/Core/Inspectors/Profiles/DataProviderAccessServiceInspector.cs
@@ -167,6 +167,7 @@ protected bool RenderDataProviderEntry(int index, GUIContent removeContent, Syst
             {
                 using (new EditorGUILayout.HorizontalScope())
                 {
+                    if (index < 0 || index >= providerFoldouts.Count) index = 0;
                     providerFoldouts[index] = EditorGUILayout.Foldout(providerFoldouts[index], providerProperties.componentName.stringValue, true);
 
                     if (GUILayout.Button(removeContent, EditorStyles.miniButtonRight, GUILayout.Width(24f)))

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@ protected bool RenderDataProviderEntry(int index, GUIContent removeContent, Syst`
`167`	`167`	`{`
`168`	`168`	`using (new EditorGUILayout.HorizontalScope())`
`169`	`169`	`{`
	`170`	`+ if (index < 0 \|\| index >= providerFoldouts.Count) index = 0;`
`170`	`171`	`providerFoldouts[index] = EditorGUILayout.Foldout(providerFoldouts[index], providerProperties.componentName.stringValue, true);`
`171`	`172`
`172`	`173`	`if (GUILayout.Button(removeContent, EditorStyles.miniButtonRight, GUILayout.Width(24f)))`