[CLI-341] HelpFormatter infinite loop with 0 width input

Author: garydgregory

src/changes/changes.xml

@@ -34,6 +34,7 @@
       <action type="fix" dev="ggregory" due-to="Arnout Engelen">Get mockito version from parent pom (#351).</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Remove -nouses directive from maven-bundle-plugin. OSGi package imports now state 'uses' definitions for package imports, this doesn't affect JPMS (from org.apache.commons:commons-parent:80).</action>
       <action type="fix" dev="ggregory" due-to="Arnout Engelen">Deprecate PatternOptionBuilder.PatternOptionBuilder().</action>
+      <action type="fix" issue="CLI-341" dev="ggregory" due-to="Gary Gregory">HelpFormatter infinite loop with 0 width input.</action>
       <!-- ADD -->
       <action type="add" issue="CLI-339" dev="ggregory" due-to="Claude Warren, Gary Gregory">Help formatter extension in the new package #314.</action>
       <action type="add" dev="ggregory" due-to="Gary Gregory">CommandLine.Builder implements Supplier&lt;CommandLine&gt;.</action>

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

@@ -499,6 +499,9 @@ <A extends Appendable> A appendOptions(final A sb, final int width, final Option
      * @throws IOException if an I/O error occurs.
      */
     <A extends Appendable> A appendWrappedText(final A appendable, final int width, final int nextLineTabStop, final String text) throws IOException {
+        if (width <= 0) {
+            return appendable;
+        }
         String render = text;
         int nextLineTabStopPos = nextLineTabStop;
         int pos = findWrapPos(render, width, 0);

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

@@ -19,6 +19,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.spy;
@@ -44,6 +45,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Test case for the HelpFormatter class.
  */
 class HelpFormatterTest {
+
     private static final String EOL = System.lineSeparator();
 
     static Stream<Arguments> deprecatedOptionsProvider() {
@@ -152,6 +154,23 @@ void testDefaultArgName() {
         assertEquals("usage: app -f <argument>" + EOL, out.toString());
     }
 
+    @Test
+    public void testDeprecatedFindWrapPosZeroWidth() {
+        final int pos = new HelpFormatter().findWrapPos("Hello World", 0, 0);
+        assertEquals(0, pos);
+    }
+
+    @Test
+    public void testDeprecatedPrintOptionsZeroWidth() {
+        final Options options = new Options();
+        options.addOption("h", "help", false, "Show help");
+        final StringWriter out = new StringWriter();
+        final PrintWriter pw = new PrintWriter(out);
+        new HelpFormatter().printOptions(pw, 0, options, 1, 3);
+        final String result = out.toString();
+        assertNotNull(result);
+    }
+
     @Test
     void testFindWrapPos() {
         final HelpFormatter hf = new HelpFormatter();