[FIXED JENKINS-48364] Treat null first vararg param properly.

jenkinsci · Dec 5, 2017 · deda81c · deda81c
1 parent ab44ba3
commit deda81c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/...main/java/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/GroovyCallSiteSelector.java b/...main/java/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/GroovyCallSiteSelector.java
@@ -102,7 +102,7 @@ private static Object[] parametersForVarargs(Class<?>[] parameterTypes, Object[]
             if (arrayLength == 1 && parameterTypes[fixedLen].isInstance(parameters[fixedLen])) {
                 // not a varargs call
                 return parameters;
-            } else if ((arrayLength > 0 && componentType.isInstance(parameters[fixedLen])) ||
+            } else if ((arrayLength > 0 && (componentType.isInstance(parameters[fixedLen]) || parameters[fixedLen] == null)) ||
                     arrayLength == 0) {
                 Object array = DefaultTypeTransformation.castToVargsArray(parameters, fixedLen, parameterTypes[fixedLen]);
                 Object[] parameters2 = new Object[fixedLen + 1];

diff --git a/...test/java/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SandboxInterceptorTest.java b/...test/java/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SandboxInterceptorTest.java
@@ -969,4 +969,15 @@ public void varArgsWithOtherArgs() throws Exception {
         String expected = "4-true-a-b-c";
         assertEvaluate(wl, expected, script);
     }
+
+    @Issue("JENKINS-48364")
+    @Test
+    public void nullFirstVarArg() throws Exception {
+        ProxyWhitelist wl = new ProxyWhitelist(new GenericWhitelist(), new AnnotatedWhitelist());
+        String uv = UsesVarargs.class.getName();
+
+        String script = "return " + uv + ".join(':', null, 'def', 'ghi')\n";
+        String expected = ":def:ghi";
+        assertEvaluate(wl, expected, script);
+    }
 }