infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-02 14:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

8240877: NPE at javax.swing.text.html.FormView.appendBuffer with null option values

Browse Source 
Reviewed-by: serb
This commit is contained in:
Prasanta Sadhukhan 2020-04-08 16:29:03 +05:30
parent f67e608861
commit a6678d2e58
2 changed files with 88 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java.desktop/share/classes/javax/swing/text/html/FormView.java
View File

@ -789,7 +789,12 @@ public class FormView extends ComponentView implements ActionListener {
for (int i = 0; i < model.getSize(); i++) {
if (model.isSelectedIndex(i)) {
Option option = model.getElementAt(i);
appendBuffer(buffer, name, option.getValue());
if (option != null) {
String value = option.getValue();
if (value != null) {
appendBuffer(buffer, name, value);
}
}
}
}
} else if (m instanceof ComboBoxModel) {
@ -797,7 +802,10 @@ public class FormView extends ComponentView implements ActionListener {
ComboBoxModel<?> model = (ComboBoxModel)m;
Option option = (Option)model.getSelectedItem();
if (option != null) {
appendBuffer(buffer, name, option.getValue());
String value = option.getValue();
if (value != null) {
appendBuffer(buffer, name, value);
}
}
}
}

78
test/jdk/javax/swing/text/html/TestFormViewNPE.java Normal file
View File

@ -0,0 +1,78 @@
/*
* Copyright (c) 2020, 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.
*/
import java.awt.BorderLayout;
import java.awt.Robot;
import java.awt.event.InputEvent;
import java.awt.event.ActionListener;
import javax.swing.DefaultButtonModel;
import javax.swing.JEditorPane;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
/*
* @test
* @key headful
* @bug 8240877
* @summary Verify NPE at FormView.appendBuffer with null option values
*/
public class TestFormViewNPE {
private static JEditorPane html;
private static JFrame frame;
private final static int width = 200;
private final static int height = 100;
private static void setup() {
html = new JEditorPane("text/html",
"<html><body><form action=\"http://localhost.cgi\">"
+ "<select name=select id=\"myCourses\" autofocus> \n" +
" <option ></option> \n" +
" </select> "
+ "<input type=submit name=submit value=\"submit\"/>"
+ "</form></body></html>");
frame = new JFrame();
frame.setLayout(new BorderLayout());
frame.add(html, BorderLayout.CENTER);
frame.setSize(width, height);
frame.setVisible(true);
}
public static void main(String[] args) throws Exception {
final Robot robot = new Robot();
robot.setAutoDelay(100);
try {
SwingUtilities.invokeAndWait(() -> setup());
robot.waitForIdle();
robot.delay(500);
robot.mouseMove(width/2, height/2);
robot.delay(500);
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
} finally {
SwingUtilities.invokeAndWait(() -> frame.dispose());
}
}
}