8230235: Rendering HTML with empty img attribute and documentBaseKey …

…cause Exception Reviewed-by: serb, aivanov
openjdk · Nov 27, 2019 · a5f4fa7 · a5f4fa7
1 parent 5c2f513
commit a5f4fa7
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 5 deletions.
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java b/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java
@@ -790,11 +790,18 @@ private void updateImageSize() {
             appropriately.
             */
             if (getLoadsSynchronously()) {
-                Dimension d = adjustWidthHeight(image.getWidth(imageObserver),
+                Image img;
-                                                image.getHeight(imageObserver));
+                synchronized(this) {
-                newWidth = d.width;
+                    img = image;
-                newHeight = d.height;
+                }
-                newState |= (WIDTH_FLAG | HEIGHT_FLAG);
+                int w = img.getWidth(imageObserver);
+                int h = img.getHeight(imageObserver);
+                if (w > 0 && h > 0) {
+                    Dimension d = adjustWidthHeight(w, h);
+                    newWidth = d.width;
+                    newHeight = d.height;
+                    newState |= (WIDTH_FLAG | HEIGHT_FLAG);
+                }
             }
 
             // Make sure the image starts loading:

diff --git a/test/jdk/javax/swing/text/html/TestJLabelWithHTMLText.java b/test/jdk/javax/swing/text/html/TestJLabelWithHTMLText.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2019, 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 8230235
+ * @summary Tests if JLabel with HTML text having empty img tag and
+ *      documentBaseKey set renders properly without NPE
+ * @run main TestJLabelWithHTMLText
+ */
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.swing.JLabel;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.basic.BasicHTML;
+
+public class TestJLabelWithHTMLText {
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JLabel label = new JLabel();
+            try {
+                label.putClientProperty(BasicHTML.documentBaseKey,
+                        new URL("https://www.google.com"));
+            } catch (MalformedURLException e) {
+                e.printStackTrace();
+            }
+            label.setText("<html><img src=''></html>");
+        });
+    }
+}