Skip to content
Permalink
Browse files

8230235: Rendering HTML with empty img attribute and documentBaseKey …

…cause Exception

Reviewed-by: serb, aivanov
  • Loading branch information
Pankaj Bansal
Pankaj Bansal committed Nov 27, 2019
1 parent 5c2f513 commit a5f4fa710f7375980519eb8c4701140b910fb622
@@ -790,11 +790,18 @@ private void updateImageSize() {
appropriately.
*/
if (getLoadsSynchronously()) {
Dimension d = adjustWidthHeight(image.getWidth(imageObserver),
image.getHeight(imageObserver));
newWidth = d.width;
newHeight = d.height;
newState |= (WIDTH_FLAG | HEIGHT_FLAG);
Image img;
synchronized(this) {
img = image;
}
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:
@@ -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>");
});
}
}

0 comments on commit a5f4fa7

Please sign in to comment.
You can’t perform that action at this time.