svn commit: r1721419 - /pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java

[lehmi]

Author: lehmi
Date: Tue Dec 22 16:04:30 2015
New Revision: 1721419

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

Modified:
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java

Modified: 
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java?rev=1721419&r1=1721418&r2=1721419&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java 
(original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java 
Tue Dec 22 16:04:30 2015
@@ -1075,7 +1075,6 @@ public class CFFParser
         {
             int first = dataInput.readSID();
             int nLeft = dataInput.readCard16();
-            charset.rangesCID2GID.add(new Format2Charset.Range(gid, first, 
nLeft));
             if (!isCIDFont)
             {
                 for (int j = 0; j < 1 + nLeft; j++)
@@ -1084,6 +1083,10 @@ public class CFFParser
                     charset.addSID(gid + j, sid, readString(sid));
                 }
             }
+            else
+            {
+                charset.rangesCID2GID.add(new Format2Charset.Range(gid, first, 
nLeft));
+            }
             gid += nLeft;
         }
         return charset;