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 2016/05/11 18:39:28 UTC

svn commit: r1743407 - /pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Parser.java

Author: tilman
Date: Wed May 11 18:39:27 2016
New Revision: 1743407

URL: http://svn.apache.org/viewvc?rev=1743407&view=rev
Log:
PDFBOX-3348: avoid NPE

Modified:
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Parser.java

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Parser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Parser.java?rev=1743407&r1=1743406&r2=1743407&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Parser.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Parser.java Wed May 11 18:39:27 2016
@@ -462,9 +462,15 @@ final class Type1Parser
         lexer = new Type1Lexer(decrypted);
 
         // find /Private dict
-        while (!lexer.peekToken().getText().equals("Private"))
+        Token peekToken = lexer.peekToken();
+        while (peekToken != null && !peekToken.getText().equals("Private"))
         {
             lexer.nextToken();
+            peekToken = lexer.peekToken();
+        }
+        if (peekToken == null)
+        {
+            throw new IOException("/Private token not found");
         }
 
         // Private dict