Improve FONT_EMBEDDING_ISSUE exception handling

DEVSIX-5147
Kaotic3 · Jul 26, 2021 · 97afe9f · 97afe9f
1 parent f85af9e
commit 97afe9f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/kernel/src/main/java/com/itextpdf/kernel/font/PdfFont.java b/kernel/src/main/java/com/itextpdf/kernel/font/PdfFont.java
@@ -538,7 +538,7 @@ protected static String updateSubsetPrefix(String fontName, boolean isSubset, bo
      * @throws PdfException Method will throw exception if {@code fontStreamBytes} is {@code null}.
      */
     protected PdfStream getPdfFontStream(byte[] fontStreamBytes, int[] fontStreamLengths) {
-        if (fontStreamBytes == null) {
+        if (fontStreamBytes == null || fontStreamLengths == null) {
             throw new PdfException(KernelExceptionMessageConstant.FONT_EMBEDDING_ISSUE);
         }
         PdfStream fontStream = new PdfStream(fontStreamBytes);

diff --git a/kernel/src/test/java/com/itextpdf/kernel/font/PdfFontUnitTest.java b/kernel/src/test/java/com/itextpdf/kernel/font/PdfFontUnitTest.java
@@ -647,4 +647,22 @@ public void cannotGetFontStreamForNullBytesTest() throws IOException {
         PdfFont pdfFont = PdfFontFactory.createFont();
         pdfFont.getPdfFontStream(null, new int[] {1});
     }
+
+    @Test
+    public void cannotGetFontStreamForNullLengthsTest() throws IOException {
+        junitExpectedException.expect(PdfException.class);
+        junitExpectedException.expectMessage(KernelExceptionMessageConstant.FONT_EMBEDDING_ISSUE);
+
+        PdfFont pdfFont = PdfFontFactory.createFont();
+        pdfFont.getPdfFontStream(new byte[] {1}, null);
+    }
+
+    @Test
+    public void cannotGetFontStreamForNullBytesAndLengthsTest() throws IOException {
+        junitExpectedException.expect(PdfException.class);
+        junitExpectedException.expectMessage(KernelExceptionMessageConstant.FONT_EMBEDDING_ISSUE);
+
+        PdfFont pdfFont = PdfFontFactory.createFont();
+        pdfFont.getPdfFontStream(null, null);
+    }
 }