You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2015/02/04 02:05:19 UTC
svn commit: r1656962 -
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
Author: jahewson
Date: Wed Feb 4 01:05:19 2015
New Revision: 1656962
URL: http://svn.apache.org/r1656962
Log:
PDFBOX-2650: Fix uni name parsing
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java?rev=1656962&r1=1656961&r2=1656962&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java Wed Feb 4 01:05:19 2015
@@ -500,12 +500,16 @@ public class TrueTypeFont implements Typ
for (int chPos = 3; chPos + 4 <= nameLength; chPos += 4)
{
int codePoint = Integer.parseInt(name.substring(chPos, chPos + 4), 16);
- if (codePoint <= 0xD7FF && codePoint >= 0xE000)
+ if (codePoint <= 0xD7FF || codePoint >= 0xE000) // disallowed code area
{
uniStr.append((char) codePoint);
}
}
String unicode = uniStr.toString();
+ if (unicode.length() == 0)
+ {
+ return -1;
+ }
return unicode.codePointAt(0);
}
catch (NumberFormatException e)