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 2019/12/06 19:41:18 UTC
svn commit: r1870927 -
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
Author: tilman
Date: Fri Dec 6 19:41:18 2019
New Revision: 1870927
URL: http://svn.apache.org/viewvc?rev=1870927&view=rev
Log:
PDFBOX-4071: avoid NPE
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java?rev=1870927&r1=1870926&r2=1870927&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java Fri Dec 6 19:41:18 2019
@@ -101,28 +101,31 @@ public class CMapParser
break;
}
- switch (op.op)
+ if (previousToken != null)
{
- case "usecmap":
- parseUsecmap((LiteralName) previousToken, result);
- break;
- case "begincodespacerange":
- parseBegincodespacerange((Number) previousToken, cmapStream, result);
- break;
- case "beginbfchar":
- parseBeginbfchar((Number) previousToken, cmapStream, result);
- break;
- case "beginbfrange":
- parseBeginbfrange((Number) previousToken, cmapStream, result);
- break;
- case "begincidchar":
- parseBegincidchar((Number) previousToken, cmapStream, result);
- break;
- case "begincidrange":
- parseBegincidrange((Integer) previousToken, cmapStream, result);
- break;
- default:
- break;
+ switch (op.op)
+ {
+ case "usecmap":
+ parseUsecmap((LiteralName) previousToken, result);
+ break;
+ case "begincodespacerange":
+ parseBegincodespacerange((Number) previousToken, cmapStream, result);
+ break;
+ case "beginbfchar":
+ parseBeginbfchar((Number) previousToken, cmapStream, result);
+ break;
+ case "beginbfrange":
+ parseBeginbfrange((Number) previousToken, cmapStream, result);
+ break;
+ case "begincidchar":
+ parseBegincidchar((Number) previousToken, cmapStream, result);
+ break;
+ case "begincidrange":
+ parseBegincidrange((Integer) previousToken, cmapStream, result);
+ break;
+ default:
+ break;
+ }
}
}
else if (token instanceof LiteralName)