Guard against NPE when converting to Elements

Samuel Huylebroeck · itext-teamcity · commit 2b98bbdcb46d · 2017-11-27T14:17:31.000+03:00
Guard when using OutlineHandler
Add test

DEVSIX-1679

Autoported commit.
Original commit hash: [8774a15b]
diff --git a/itext.tests/itext.html2pdf.tests/itext/html2pdf/Html2ElementsTest.cs b/itext.tests/itext.html2pdf.tests/itext/html2pdf/Html2ElementsTest.cs
@@ -42,6 +42,7 @@ source product.
 */
 using System;
 using System.Collections.Generic;
+using iText.Html2pdf.Attach.Impl;
 using iText.Layout.Element;
 using iText.Layout.Properties;
 using iText.Test;
@@ -147,5 +148,25 @@ public virtual void HtmlToElementsTest08() {
             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);
         }
+
+        /// <exception cref="System.IO.IOException"/>
+        [NUnit.Framework.Test]
+        public virtual void HtmlToElementsTest09() {
+            //Test OutlineHandler exception throwing
+            /*
+            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);
+        }
     }
 }
diff --git a/itext/itext.html2pdf/itext/html2pdf/attach/impl/OutlineHandler.cs b/itext/itext.html2pdf/itext/html2pdf/attach/impl/OutlineHandler.cs
@@ -143,7 +143,7 @@ public virtual void Reset() {
         internal virtual 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);
@@ -173,7 +173,7 @@ internal virtual OutlineHandler AddOutline(ITagWorker tagWorker, IElementNode el
         /// <returns>the outline handler</returns>
         internal virtual OutlineHandler AddDestination(ITagWorker tagWorker, IElementNode element) {
             String tagName = element.Name();
-            if (null != tagWorker && HasTagPriorityMapping(tagName)) {
+            if (null != tagWorker && HasTagPriorityMapping(tagName) && destinationsInProcess.Count > 0) {
                 String content = destinationsInProcess.JRemoveFirst();
                 if (tagWorker.GetElementResult() is IElement) {
                     tagWorker.GetElementResult().SetProperty(Property.DESTINATION, content);
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-e1b550952c9e49af7b1fdf6c8a0d17aa7bea0f23
+8774a15bbac67df1924b0a3a26a8aa63d593f18c

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-e1b550952c9e49af7b1fdf6c8a0d17aa7bea0f23`
	`1`	`+8774a15bbac67df1924b0a3a26a8aa63d593f18c`