fix NPE when rendering "demo/lists.html" in BrowserStartup

flyingsaucerproject · Oct 26, 2024 · 296b2f2 · 296b2f2
1 parent ae00427
commit 296b2f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/ImageResourceLoader.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/ImageResourceLoader.java
@@ -65,6 +65,9 @@ public static ImageResource loadImageResourceFromUri(final String uri) {
 
         try (InputStream is = IOUtil.getInputStream(uri)) {
             try {
+                if (is == null) {
+                    return createImageResource(uri, null);
+                }
                 BufferedImage img = ImageIO.read(is);
                 if (img == null) {
                     throw new IOException("ImageIO.read() returned null");

diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/ScalableXHTMLPanel.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/ScalableXHTMLPanel.java
@@ -167,14 +167,16 @@ protected void doRender(RenderingContext c, Layer root) {
         AffineTransform current = g.getTransform();
 
         PaintingInfo pI = root.getMaster().getPaintingInfo();
-        Dimension layoutSize = pI.getOuterMarginCorner();
+        if (pI != null) {
+            Dimension layoutSize = pI.getOuterMarginCorner();
 
-        calculateScaleAccordingToPolicy(layoutSize);
+            calculateScaleAccordingToPolicy(layoutSize);
 
-        if (lastLayoutSize == null) {
-            lastLayoutSize = layoutSize;
-            setPreferredSize(new Dimension((int) (lastLayoutSize.width * scale), (int) (lastLayoutSize.height * scale)));
-            revalidate();
+            if (lastLayoutSize == null) {
+                lastLayoutSize = layoutSize;
+                setPreferredSize(new Dimension((int) (lastLayoutSize.width * scale), (int) (lastLayoutSize.height * scale)));
+                revalidate();
+            }
         }
 
         g.transform(AffineTransform.getScaleInstance(scale, scale));