Skip to content

Commit 46251bc

Browse files
committed
8224267: JOptionPane message string with 5000+ newlines produces StackOverflowError
Reviewed-by: tr, aivanov
1 parent bba6be7 commit 46251bc

File tree

2 files changed

+68
-2
lines changed

2 files changed

+68
-2
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ public class BasicOptionPaneUI extends OptionPaneUI {
8989
public static final int MinimumHeight = 90;
9090

9191
private static String newline;
92+
private static int recursionCount;
9293

9394
/**
9495
* {@code JOptionPane} that the receiver is providing the
@@ -460,7 +461,7 @@ protected void addMessageComponents(Container container,
460461
@SuppressWarnings("serial") // anonymous class
461462
JPanel breakPanel = new JPanel() {
462463
public Dimension getPreferredSize() {
463-
Font f = getFont();
464+
Font f = getFont();
464465

465466
if (f != null) {
466467
return new Dimension(1, f.getSize() + 2);
@@ -475,8 +476,14 @@ public Dimension getPreferredSize() {
475476
addMessageComponents(container, cons, s.substring(0, nl),
476477
maxll, false);
477478
}
479+
// Prevent recursion of more than
480+
// 200 successive newlines in a message
481+
if (recursionCount++ > 200) {
482+
recursionCount = 0;
483+
return;
484+
}
478485
addMessageComponents(container, cons, s.substring(nl + nll), maxll,
479-
false);
486+
false);
480487

481488
} else if (len > maxll) {
482489
Container c = Box.createVerticalBox();
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
/* @test
25+
@bug 8224267
26+
@key headful
27+
@summary Verifies if StackOverflowError is not thrown for multiple newlines
28+
@run main TestOptionPaneStackOverflow
29+
*/
30+
31+
import javax.swing.JDialog;
32+
import javax.swing.JFrame;
33+
import javax.swing.JOptionPane;
34+
import javax.swing.SwingUtilities;
35+
36+
public class TestOptionPaneStackOverflow
37+
{
38+
static JFrame frame;
39+
40+
public static void main(String[] argv) throws Exception
41+
{
42+
try {
43+
String message = java.nio.CharBuffer.allocate(5000).toString().
44+
replace('\0','\n');
45+
SwingUtilities.invokeAndWait(() -> {
46+
frame = new JFrame();
47+
JOptionPane optionPane = new JOptionPane();
48+
optionPane.createDialog(frame, null);
49+
optionPane.setMessage(message);
50+
});
51+
} finally {
52+
SwingUtilities.invokeAndWait(() -> {
53+
if (frame != null) {
54+
frame.dispose();
55+
}
56+
});
57+
}
58+
}
59+
}

0 commit comments

Comments
 (0)