Fix NPE in DefaultParser.isLongOption(String) seen in the wild.

garydgregory · garydgregory · commit 81cf67387da8 · 2021-07-29T15:49:10.000-04:00
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -23,9 +23,14 @@
   <body>
 
     <release version="1.5" date="tba" description="tba">
+      <!-- FIX -->
+      <action type="update" dev="ggregory" due-to="Gary Gregory">
+        Fix NPE in DefaultParser.isLongOption(String).
+      </action>
       <action type="update" dev="britter" due-to="Krishna Mohan Rao Kandunoori" issue="CLI-279">
         @param or @return lines should end with a period in CommandLine.java
       </action>
+      <!-- ADD -->
       <action type="add" dev="chtompki" due-to="Rubin Simons" issue="CLI-217">
         Accommodate toggling partial matching in DefaultParser.
       </action>
@@ -41,6 +46,7 @@
       <action type="add" dev="ggregory" due-to="Alex Nordlund" issue="CLI-282">
         TypeHandler should throw ParseException for an unsupported class.
       </action>
+      <!-- UPDATE -->
       <action type="update" dev="ggregory" issue="CLI-294">
         Update Java from version 5 to 7.
       </action>
diff --git a/src/main/java/org/apache/commons/cli/DefaultParser.java b/src/main/java/org/apache/commons/cli/DefaultParser.java
@@ -347,7 +347,7 @@ private boolean isOption(final String token)
     private boolean isShortOption(final String token)
     {
         // short options (-S, -SV, -S=V, -SV1=V2, -S1S2)
-        if (!token.startsWith("-") || token.length() == 1)
+        if (token == null || !token.startsWith("-") || token.length() == 1)
         {
             return false;
         }
@@ -370,7 +370,7 @@ private boolean isShortOption(final String token)
      */
     private boolean isLongOption(final String token)
     {
-        if (!token.startsWith("-") || token.length() == 1)
+        if (token == null || !token.startsWith("-") || token.length() == 1)
         {
             return false;
         }

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ private boolean isOption(final String token)`
`347`	`347`	`private boolean isShortOption(final String token)`
`348`	`348`	`{`
`349`	`349`	`// short options (-S, -SV, -S=V, -SV1=V2, -S1S2)`
`350`		`- if (!token.startsWith("-") \|\| token.length() == 1)`
	`350`	`+ if (token == null \|\| !token.startsWith("-") \|\| token.length() == 1)`
`351`	`351`	`{`
`352`	`352`	`return false;`
`353`	`353`	`}`
`@@ -370,7 +370,7 @@ private boolean isShortOption(final String token)`
`370`	`370`	`*/`
`371`	`371`	`private boolean isLongOption(final String token)`
`372`	`372`	`{`
`373`		`- if (!token.startsWith("-") \|\| token.length() == 1)`
	`373`	`+ if (token == null \|\| !token.startsWith("-") \|\| token.length() == 1)`
`374`	`374`	`{`
`375`	`375`	`return false;`
`376`	`376`	`}`