You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2022/01/01 16:30:28 UTC

svn commit: r1896600 - /pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/type1/Type1Lexer.java

Author: tilman
Date: Sat Jan  1 16:30:27 2022
New Revision: 1896600

URL: http://svn.apache.org/viewvc?rev=1896600&view=rev
Log:
PDFBOX-5339: avoid NullPointerException

Modified:
    pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/type1/Type1Lexer.java

Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/type1/Type1Lexer.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/type1/Type1Lexer.java?rev=1896600&r1=1896599&r2=1896600&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/type1/Type1Lexer.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/type1/Type1Lexer.java Sat Jan  1 16:30:27 2022
@@ -140,7 +140,14 @@ class Type1Lexer
                 }
                 else if (c == '/')
                 {
-                    return new Token(readRegular(), Token.LITERAL);
+                    String regular = readRegular();
+                    if (regular == null)
+                    {
+                        // the stream is corrupt
+                        throw new DamagedFontException("Could not read token at position " +
+                                                        buffer.position());
+                    }
+                    return new Token(regular, Token.LITERAL);
                 }
                 else if (c == '<')
                 {