Avoid NullPointerException in Util.stripLeadingAndTrailingQuotes(String)

garydgregory · garydgregory · commit ae7147049e8f · 2024-02-16T11:41:45.000-05:00
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -24,13 +24,14 @@
   <body>
     <release version="1.7.0" date="202Y-MM-DD" description="New features and bug fixes">
       <!-- FIX -->
-      <action type="fix" issue="CLI-312" dev="ggregory" due-to="Claude Warren, Gary Gregory">Inconsistent behaviour in key/value pairs (Java property style).</action>
+      <action type="fix" issue="CLI-312" dev="ggregory" due-to="Claude Warren, Gary Gregory">Inconsistent behavior in key/value pairs (Java property style).</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">Avoid NullPointerException in Util.stripLeadingAndTrailingQuotes(String).</action>
       <!-- ADD -->
       <action type="add" issue="CLI-321" dev="ggregory" due-to="Claude Warren, Gary Gregory">Add and use a Converter interface and implementations without using BeanUtils #216.</action>
       <action type="add" dev="ggregory" due-to="Gary Gregory">Add Maven property project.build.outputTimestamp for build reproducibility.</action>
       <action type="add" issue="CLI-322" dev="ggregory" due-to="Claude Warren, Gary Gregory">Add '-' as an option char and implemented extensive tests #217.</action>
       <action type="add" issue="CLI-324" dev="ggregory" due-to="Claude Warren, Gary Gregory">Make adding OptionGroups and Options to existing Options easier #230.</action>
-      <action type="add" issue="CLI-323" dev="ggregory" due-to="Claude Warren, Gary Gregory">Added Supplier<T> defaults for getParsedOptionValue #229 .</action>
+      <action type="add" issue="CLI-323" dev="ggregory" due-to="Claude Warren, Gary Gregory">Added Supplier&lt;T&gt; defaults for getParsedOptionValue #229 .</action>
       <!-- UPDATE -->
       <action type="update" dev="ggregory" due-to="Gary Gregory">Bump commons-parent from 64 to 66.</action>
     </release>
diff --git a/src/main/java/org/apache/commons/cli/Util.java b/src/main/java/org/apache/commons/cli/Util.java
@@ -27,13 +27,26 @@ final class Util {
      */
     static final String[] EMPTY_STRING_ARRAY = {};
 
+    /**
+     * Tests whether the given string is null or empty.
+     *
+     * @param str The string to test.
+     * @return Whether the given string is null or empty.
+     */
+    private static boolean isEmpty(final String str) {
+        return str == null || str.isEmpty();
+    }
+
     /**
      * Removes the leading and trailing quotes from {@code str}. E.g. if str is '"one two"', then 'one two' is returned.
      *
      * @param str The string from which the leading and trailing quotes should be removed.
      * @return The string without the leading and trailing quotes.
      */
     static String stripLeadingAndTrailingQuotes(final String str) {
+        if (isEmpty(str)) {
+            return str;
+        }
         final int length = str.length();
         if (length > 1 && str.startsWith("\"") && str.endsWith("\"") && str.substring(1, length - 1).indexOf('"') == -1) {
             return str.substring(1, length - 1);
@@ -48,8 +61,8 @@ static String stripLeadingAndTrailingQuotes(final String str) {
      * @return the new String.
      */
     static String stripLeadingHyphens(final String str) {
-        if (str == null) {
-            return null;
+        if (isEmpty(str)) {
+            return str;
         }
         if (str.startsWith("--")) {
             return str.substring(2);
