CommandLine.addOption(Option) should not allow a null Option

Author: garydgregory

src/changes/changes.xml

@@ -52,6 +52,9 @@
       <action dev="ggregory" type="fix" due-to="Dilraj Singh, Gary Gregory" issue="CLI-283">
         Fix NPE in CommandLine.resolveOption(String).
       </action>
+      <action dev="ggregory" type="fix" due-to="Dilraj Singh, Gary Gregory" issue="CLI-283">
+        CommandLine.addOption(Option) should not allow a null Option.
+      </action>
       <!-- ADD -->
       <action type="update" dev="ggregory" due-to="Dependabot, Gary Gregory">
         Add github/codeql-action.

src/main/java/org/apache/commons/cli/CommandLine.java

@@ -108,7 +108,9 @@ protected void addArg(final String arg) {
      * @param opt the processed option.
      */
     protected void addOption(final Option opt) {
-        options.add(opt);
+        if (opt != null) {
+            options.add(opt);
+        }
     }
 
     /**

src/test/java/org/apache/commons/cli/CommandLineTest.java

@@ -40,6 +40,18 @@ public void testBuilder() {
         assertEquals("T", cmd.getOptions()[0].getOpt());
     }
 
+    @Test
+    public void testBuilderNulls() {
+        final CommandLine.Builder builder = new CommandLine.Builder();
+        builder.addArg("foo").addArg("bar");
+        builder.addOption(null);
+        final CommandLine cmd = builder.build();
+
+        assertEquals("foo", cmd.getArgs()[0]);
+        assertEquals("bar", cmd.getArgList().get(1));
+        assertEquals(0, cmd.getOptions().length);
+    }
+
     @Test
     public void testGetOptionProperties() throws Exception {
         final String[] args = {"-Dparam1=value1", "-Dparam2=value2", "-Dparam3", "-Dparam4=value4", "-D", "--property", "foo=bar"};