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/09/24 15:25:42 UTC
svn commit: r1762125 -
/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java
Author: tilman
Date: Sat Sep 24 15:25:42 2016
New Revision: 1762125
URL: http://svn.apache.org/viewvc?rev=1762125&view=rev
Log:
PDFBOX-3511: avoid NullPointerException
Modified:
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java?rev=1762125&r1=1762124&r2=1762125&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java Sat Sep 24 15:25:42 2016
@@ -256,7 +256,7 @@ public class GlyfCompositeDescript exten
for (GlyfCompositeComp c : components)
{
GlyphDescription gd = descriptions.get(c.getGlyphIndex());
- if (c.getFirstIndex() <= i && i < (c.getFirstIndex() + gd.getPointCount()))
+ if (c.getFirstIndex() <= i && gd != null && i < (c.getFirstIndex() + gd.getPointCount()))
{
return c;
}
@@ -269,7 +269,7 @@ public class GlyfCompositeDescript exten
for (GlyfCompositeComp c : components)
{
GlyphDescription gd = descriptions.get(c.getGlyphIndex());
- if (c.getFirstContour() <= i && i < (c.getFirstContour() + gd.getContourCount()))
+ if (c.getFirstContour() <= i && gd != null && i < (c.getFirstContour() + gd.getContourCount()))
{
return c;
}