PDFBOX-5917: when offset points to end of the stream then it's empty

THausherr · THausherr · commit f765bf5d408c · 2024-12-02T19:09:28.000Z
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1922270 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphTable.java b/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphTable.java
@@ -138,11 +138,12 @@ GlyphData getGlyph(int gid, int level) throws IOException
             // read a single glyph
             long[] offsets = loca.getOffsets();
 
-            if (offsets[gid] == offsets[gid + 1])
+            if (offsets[gid] == offsets[gid + 1] || offsets[gid] == data.getOriginalDataSize())
             {
                 // no outline
                 // PDFBOX-5135: can't return null, must return an empty glyph because
                 // sometimes this is used in a composite glyph.
+                // PDFBOX-5917: offset points to end of the stream
                 glyph = new GlyphData();
                 glyph.initEmptyData();
             }

Original file line number	Diff line number	Diff line change
`@@ -138,11 +138,12 @@ GlyphData getGlyph(int gid, int level) throws IOException`
`138`	`138`	`// read a single glyph`
`139`	`139`	`long[] offsets = loca.getOffsets();`
`140`	`140`
`141`		`- if (offsets[gid] == offsets[gid + 1])`
	`141`	`+ if (offsets[gid] == offsets[gid + 1] \|\| offsets[gid] == data.getOriginalDataSize())`
`142`	`142`	`{`
`143`	`143`	`// no outline`
`144`	`144`	`// PDFBOX-5135: can't return null, must return an empty glyph because`
`145`	`145`	`// sometimes this is used in a composite glyph.`
	`146`	`+ // PDFBOX-5917: offset points to end of the stream`
`146`	`147`	`glyph = new GlyphData();`
`147`	`148`	`glyph.initEmptyData();`
`148`	`149`	`}`