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

handle NPE in justify text edge case #420
danfickle · Dec 4, 2019 · 19887e0 · 19887e0
2 parents 884194c + ec95f5e
commit 19887e0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
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/.../src/main/resources/visualtest/expected/issue-420-justify-text-null-pointer-exception.pdf b/.../src/main/resources/visualtest/expected/issue-420-justify-text-null-pointer-exception.pdf
diff --git a/...les/src/main/resources/visualtest/html/issue-420-justify-text-null-pointer-exception.html b/...les/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/...-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java b/...-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 @@
		<html><body><p style="text-align: justify"><span>a<br />b</span></p></body></html>