Changing the current OutOfMemoryError to a RuntimeException per CLI-162. A new ticket for the RuntimeException is at CLI-174

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/branches/cli-1.x@735257 13f79535-47bb-0310-9956-ffa450edef68

Author: hen

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

@@ -821,6 +821,7 @@ protected StringBuffer renderWrappedText(StringBuffer sb, int width,
 
         while (true)
         {
+            int lastPos = pos;
             text = padding + text.substring(pos).trim();
             pos = findWrapPos(text, width, 0);
 
@@ -829,6 +830,10 @@ protected StringBuffer renderWrappedText(StringBuffer sb, int width,
                 sb.append(text);
 
                 return sb;
+            } else
+            if (pos == lastPos)
+            {
+                throw new RuntimeException("Text too long for line - throwing exception to avoid infinite loop [CLI-162]: " + text);
             }
 
             sb.append(rtrim(text.substring(0, pos))).append(defaultNewLine);

src/test/org/apache/commons/cli/bug/BugCLI162Test.java

@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.commons.cli.bug;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.MissingArgumentException;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.PosixParser;
+
+import junit.framework.TestCase;
+
+public class BugCLI162Test extends TestCase {
+
+    private Options options;
+
+    public void setUp() {
+        options = new Options();
+        options.addOption("h", "help", false, "This is a looooong description");
+    }
+
+    public void testInfiniteLoop() {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.setWidth(20);
+        try {
+            formatter.printHelp("app", options); // hang & crash
+        } catch(RuntimeException re) {
+            assertTrue(re.getMessage().startsWith("Text too long for line - throwing exception to avoid infinite loop [CLI-162]: "));
+        }
+    }
+
+}