Merge pull request #110 from oleg-nenashev/JENKINS-48634

[JENKINS-48634] - implement more robust form handling in Status#doBuild()
jenkinsci · Feb 12, 2018 · 3849c36 · 3849c36
2 parents 41412fb + 7520623
commit 3849c36
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/promoted_builds/Status.java b/src/main/java/hudson/plugins/promoted_builds/Status.java
@@ -12,6 +12,7 @@
 import hudson.plugins.promoted_builds.conditions.ManualCondition;
 import hudson.util.Iterators;
 import net.sf.json.JSONArray;
+import net.sf.json.JSONNull;
 import net.sf.json.JSONObject;
 
 import org.kohsuke.stapler.StaplerRequest;
@@ -398,7 +399,15 @@ public void doBuild(StaplerRequest req, StaplerResponse rsp) throws IOException,
                     JSONArray a = JSONArray.fromObject(formData.get("parameter"));
 
                     for (Object o : a) {
-                        JSONObject jo = (JSONObject) o;
+                        final JSONObject jo;
+                        if (o instanceof JSONObject) {
+                            jo = (JSONObject) o;
+                        } else if (o instanceof JSONNull) {
+                            continue; // ignore nulls
+                        } else {
+                            throw new IllegalArgumentException("Array type is not supported " + o);
+                        }
+
                         String name = jo.getString("name");
 
                         ParameterDefinition d = manualCondition.getParameterDefinition(name);