Guard against NPE when converting to Elements

Samuel Huylebroeck · Samuel Huylebroeck · commit 8774a15bbac6 · 2017-11-24T14:48:04.000+01:00
Guard when using OutlineHandler
Add test

DEVSIX-1679
diff --git a/src/main/java/com/itextpdf/html2pdf/attach/impl/OutlineHandler.java b/src/main/java/com/itextpdf/html2pdf/attach/impl/OutlineHandler.java
@@ -178,7 +178,7 @@ public void reset() {
      */
     OutlineHandler addOutline(ITagWorker tagWorker, IElementNode element, ProcessorContext context) {
         String tagName = element.name();
-        if (null != tagWorker && hasTagPriorityMapping(tagName)) {
+        if (null != tagWorker && hasTagPriorityMapping(tagName) && context.getPdfDocument() != null) {
             int level = (int) getTagPriorityMapping(tagName);
             if (null == currentOutline) {
                 currentOutline = context.getPdfDocument().getOutlines(false);
@@ -213,7 +213,7 @@ OutlineHandler addOutline(ITagWorker tagWorker, IElementNode element, ProcessorC
      */
     OutlineHandler addDestination(ITagWorker tagWorker, IElementNode element) {
         String tagName = element.name();
-        if (null != tagWorker && hasTagPriorityMapping(tagName)) {
+        if (null != tagWorker && hasTagPriorityMapping(tagName) && destinationsInProcess.size()>0) {
             String content = destinationsInProcess.pop();
             if (tagWorker.getElementResult() instanceof IElement) {
                 tagWorker.getElementResult().setProperty(Property.DESTINATION, content);
diff --git a/src/test/java/com/itextpdf/html2pdf/Html2ElementsTest.java b/src/test/java/com/itextpdf/html2pdf/Html2ElementsTest.java
@@ -42,6 +42,7 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.html2pdf;
 
+import com.itextpdf.html2pdf.attach.impl.OutlineHandler;
 import com.itextpdf.layout.element.IElement;
 import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.layout.element.Table;
@@ -153,4 +154,24 @@ public void htmlToElementsTest08() throws IOException {
         String html = "<html><p>Hello world!</p><meta name=\"author\" content=\"Bruno\"><table><tr><td>123</td><td><456></td></tr><tr><td>Long cell</td></tr></table><p>Hello world!</p></html>";
         HtmlConverter.convertToElements(html);
     }
+
+    @Test
+    //Test OutlineHandler exception throwing
+    public void htmlToElementsTest09() throws IOException {
+        /*
+            Outlines require a PdfDocument, and OutlineHandler is based around its availability
+            Any convert to elements workflow of course doesn't have a PdfDocument.
+            Instead of throwing an NPE when trying it, the OutlineHandler will check for the existence of a pdfDocument
+            If no PdfDocument is found, the handler will do nothing silently
+         */
+        String html = "<html><p>Hello world!</p><meta name=\"author\" content=\"Bruno\"><table><tr><td>123</td><td><456></td></tr><tr><td>Long cell</td></tr></table><p>Hello world!</p></html>";
+        ConverterProperties props = new ConverterProperties();
+        OutlineHandler outlineHandler = new OutlineHandler();
+        outlineHandler.putTagPriorityMapping("h1", 1);
+        outlineHandler.putTagPriorityMapping("h3",2);
+        outlineHandler.putTagPriorityMapping("p", 3);
+        props.setOutlineHandler(outlineHandler);
+
+        HtmlConverter.convertToElements(html);
+    }
 }
