Automatic merge of client:master into master

openjdk · Apr 8, 2020 · e00df2c2d39ee5b24ded88c7da4e639ffbdde86d · e00df2c
2 parents 4ae50c4 + a6678d2
commit e00df2c2d39ee5b24ded88c7da4e639ffbdde86d
Unified Split

Showing with 88 additions and 2 deletions.

+10 −2 src/java.desktop/share/classes/javax/swing/text/html/FormView.java

+78 −0 test/jdk/javax/swing/text/html/TestFormViewNPE.java
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/FormView.java b/src/java.desktop/share/classes/javax/swing/text/html/FormView.java
@@ -789,15 +789,23 @@ private void loadSelectData(AttributeSet attr, StringBuilder buffer) {
             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) {
             @SuppressWarnings("unchecked")
             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);
+                }
             }
         }
     }

diff --git a/test/jdk/javax/swing/text/html/TestFormViewNPE.java b/test/jdk/javax/swing/text/html/TestFormViewNPE.java
@@ -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());
+        }
+    }
+}