8224267: JOptionPane message string with 5000+ newlines produces Stac…

…kOverflowError

Reviewed-by: tr, aivanov

src/java.desktop/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java

@@ -89,6 +89,7 @@ public class BasicOptionPaneUI extends OptionPaneUI {
     public static final int MinimumHeight = 90;
 
     private static String newline;
+    private static int recursionCount;
 
     /**
      * {@code JOptionPane} that the receiver is providing the
@@ -460,7 +461,7 @@ protected void addMessageComponents(Container container,
                     @SuppressWarnings("serial") // anonymous class
                     JPanel breakPanel = new JPanel() {
                         public Dimension getPreferredSize() {
-                            Font       f = getFont();
+                            Font f = getFont();
 
                             if (f != null) {
                                 return new Dimension(1, f.getSize() + 2);
@@ -475,8 +476,14 @@ public Dimension getPreferredSize() {
                     addMessageComponents(container, cons, s.substring(0, nl),
                                       maxll, false);
                 }
+                // Prevent recursion of more than
+                // 200 successive newlines in a message
+                if (recursionCount++ > 200) {
+                    recursionCount = 0;
+                    return;
+                }
                 addMessageComponents(container, cons, s.substring(nl + nll), maxll,
-                                  false);
+                                     false);
 
             } else if (len > maxll) {
                 Container c = Box.createVerticalBox();

test/jdk/javax/swing/JOptionPane/TestOptionPaneStackOverflow.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+   @bug 8224267
+   @key headful
+   @summary Verifies if StackOverflowError is not thrown for multiple newlines
+   @run main TestOptionPaneStackOverflow
+ */
+
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+
+public class TestOptionPaneStackOverflow
+{
+    static JFrame frame;
+
+    public static void main(String[] argv) throws Exception
+    {
+        try {
+            String message = java.nio.CharBuffer.allocate(5000).toString().
+                                  replace('\0','\n');
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame();
+                JOptionPane optionPane = new JOptionPane();
+                optionPane.createDialog(frame, null);
+                optionPane.setMessage(message);
+            });
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}