GROOVY-11448: STC: subList bounds check

apache · Sep 5, 2024 · f40842b · f40842b
1 parent 210ae70
commit f40842b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4037,7 +4037,7 @@ private   void checkForbiddenSpreadArgument(final ArgumentListExpression argumen
             checkForbiddenSpreadArgument(arguments);
         } else { // GROOVY-10597: allow spread for the ... param
             List<Expression> list = arguments.getExpressions();
-            list = list.subList(0, parameters.length - 1);
+            list = list.subList(0, Math.min(parameters.length - 1, list.size())); // GROOVY-11448
             checkForbiddenSpreadArgument(args(list));
         }
     }

diff --git a/src/test/groovy/transform/stc/ClosuresSTCTest.groovy b/src/test/groovy/transform/stc/ClosuresSTCTest.groovy
@@ -179,6 +179,15 @@ class ClosuresSTCTest extends StaticTypeCheckingTestCase {
         'Cannot call closure that accepts [java.lang.Object, java.lang.Object] with [java.lang.String]'
     }
 
+    // GROOVY-11448
+    void testCallClosure18() {
+        assertScript '''
+            def c = { int x = 0, int[] y = new int[0] -> return x }
+            assert c( ) == 0
+            assert c(1) == 1
+        '''
+    }
+
     void testClosureReturnTypeInference1() {
         assertScript '''
             def c = { int a, int b -> return a + b }