Merge pull request #421 from syjer/420-text-align-justify-npe

danfickle · web-flow · commit 19887e05a58d · 2019-12-04T21:58:00.000+11:00
handle NPE in justify text edge case #420
diff --git a/openhtmltopdf-core/src/main/java/com/openhtmltopdf/render/InlineText.java b/openhtmltopdf-core/src/main/java/com/openhtmltopdf/render/InlineText.java
@@ -312,6 +312,10 @@ public float calcTotalAdjustment(JustificationInfo info) {
             // letter spacing is already explicitly set.
             return 0f;
         }
+
+        if (_counts == null) {
+            return 0f;
+        }
         
         return (_counts.getSpaceCount() * info.getSpaceAdjust()) +
                (_counts.getNonSpaceCount() * info.getNonSpaceAdjust());
diff --git a/openhtmltopdf-examples/src/main/resources/visualtest/expected/issue-420-justify-text-null-pointer-exception.pdf b/openhtmltopdf-examples/src/main/resources/visualtest/expected/issue-420-justify-text-null-pointer-exception.pdf
diff --git a/openhtmltopdf-examples/src/main/resources/visualtest/html/issue-420-justify-text-null-pointer-exception.html b/openhtmltopdf-examples/src/main/resources/visualtest/html/issue-420-justify-text-null-pointer-exception.html
@@ -0,0 +1 @@
+<html><body><p style="text-align: justify"><span>a<br />b</span></p></body></html>
diff --git a/openhtmltopdf-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java b/openhtmltopdf-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java
@@ -923,7 +923,12 @@ public void testIssue399TableHeaderFooterWithNoRows() throws IOException {
         assertTrue(vt.runTest("issue-399-table-header-with-no-rows"));    
     }
     
-    
+
+    @Test
+    public void testIssue420JustifyTextNullPointerException() throws IOException {
+        assertTrue(vt.runTest("issue-420-justify-text-null-pointer-exception"));
+    }
+
     // TODO:
     // + Elements that appear just on generated overflow pages.
     // + content property (page counters, etc)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<html><body><p style="text-align: justify"><span>a<br />b</span></p></body></html>`