Fix problem with NullPointerException in ListStyleApplierUtil class and add invalidLinearGradientTest

introfog · introfog · commit 3b3020dbc05f · 2020-06-22T08:56:10.000+03:00
DEVSIX-4138
diff --git a/src/main/java/com/itextpdf/html2pdf/css/apply/util/ListStyleApplierUtil.java b/src/main/java/com/itextpdf/html2pdf/css/apply/util/ListStyleApplierUtil.java
@@ -141,13 +141,16 @@ public static void applyListStyleImageProperty(Map<String, String> cssProps, Pro
                     if (gradientBuilder != null) {
                         Rectangle formBBox = new Rectangle(0, 0, em * LIST_ITEM_MARKER_SIZE_COEFFICIENT,
                                 em * LIST_ITEM_MARKER_SIZE_COEFFICIENT);
-                        imageXObject = new PdfFormXObject(formBBox);
+
                         PdfDocument pdfDocument = context.getPdfDocument();
                         Color gradientColor = gradientBuilder.buildColor(formBBox, null, pdfDocument);
-                        new PdfCanvas((PdfFormXObject) imageXObject, pdfDocument)
-                                .setColor(gradientColor, true)
-                                .rectangle(formBBox)
-                                .fill();
+                        if (gradientColor != null) {
+                            imageXObject = new PdfFormXObject(formBBox);
+                            new PdfCanvas((PdfFormXObject) imageXObject, context.getPdfDocument())
+                                    .setColor(gradientColor, true)
+                                    .rectangle(formBBox)
+                                    .fill();
+                        }
                     }
                 } catch (StyledXMLParserException e) {
                     LOGGER.warn(MessageFormatUtil.format(
diff --git a/src/test/java/com/itextpdf/html2pdf/css/ListStyleImageLinearGradientTest.java b/src/test/java/com/itextpdf/html2pdf/css/ListStyleImageLinearGradientTest.java
@@ -23,8 +23,11 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf.css;
 
 import com.itextpdf.html2pdf.HtmlConverter;
+import com.itextpdf.html2pdf.LogMessageConstant;
 import com.itextpdf.kernel.utils.CompareTool;
 import com.itextpdf.test.ExtendedITextTest;
+import com.itextpdf.test.annotations.LogMessage;
+import com.itextpdf.test.annotations.LogMessages;
 import com.itextpdf.test.annotations.type.IntegrationTest;
 
 import java.io.File;
@@ -55,6 +58,12 @@ public void linearGradientTypeTest() throws IOException, InterruptedException {
         runTest("linearGradientType");
     }
 
+    @Test
+    @LogMessages(messages = {@LogMessage(messageTemplate = LogMessageConstant.INVALID_GRADIENT_DECLARATION, count = 3)})
+    public void invalidLinearGradientTypeTest() throws IOException, InterruptedException {
+        runTest("invalidLinearGradientType");
+    }
+
     @Test
     public void repeatingLinearGradientTypeTest() throws IOException, InterruptedException {
         runTest("repeatingLinearGradientType");
diff --git a/src/test/resources/com/itextpdf/html2pdf/css/ListStyleImageLinearGradientTest/cmp_invalidLinearGradientType.pdf b/src/test/resources/com/itextpdf/html2pdf/css/ListStyleImageLinearGradientTest/cmp_invalidLinearGradientType.pdf
diff --git a/src/test/resources/com/itextpdf/html2pdf/css/ListStyleImageLinearGradientTest/invalidLinearGradientType.html b/src/test/resources/com/itextpdf/html2pdf/css/ListStyleImageLinearGradientTest/invalidLinearGradientType.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <style>
+    ol li {
+        list-style-image: linear-gradient(,);
+    }
+    </style>
+</head>
+<body>
+    <ol>
+        <li>1</li>
+        <li>2</li>
+        <li>3</li>
+    </ol>
+</body>
+</html>
