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 2024/05/23 15:19:58 UTC

svn commit: r1917925 - in /pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf: GlyfCompositeDescript.java GlyphData.java GlyphTable.java

Author: tilman
Date: Thu May 23 15:19:58 2024
New Revision: 1917925

URL: http://svn.apache.org/viewvc?rev=1917925&view=rev
Log:
PDFBOX-5827: avoid stack overflow by tracking the depth up to maxp.MaxComponentDepth

Modified:
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphTable.java

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java?rev=1917925&r1=1917924&r2=1917925&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyfCompositeDescript.java Thu May 23 15:19:58 2024
@@ -55,9 +55,10 @@ public class GlyfCompositeDescript exten
      * 
      * @param bais the stream to be read
      * @param glyphTable the Glyphtable containing all glyphs
+     * @param level current level
      * @throws IOException is thrown if something went wrong
      */
-    GlyfCompositeDescript(TTFDataStream bais, GlyphTable glyphTable) throws IOException
+    GlyfCompositeDescript(TTFDataStream bais, GlyphTable glyphTable, int level) throws IOException
     {
         super((short) -1);
 
@@ -77,7 +78,7 @@ public class GlyfCompositeDescript exten
         {
             readInstructions(bais, (bais.readUnsignedShort()));
         }
-        initDescriptions();
+        initDescriptions(level);
     }
 
     /**
@@ -292,14 +293,14 @@ public class GlyfCompositeDescript exten
         return null;
     }
 
-    private void initDescriptions()
+    private void initDescriptions(int level)
     {
         for (GlyfCompositeComp component : components)
         {
             try
             {
                 int index = component.getGlyphIndex();
-                GlyphData glyph = glyphTable.getGlyph(index);
+                GlyphData glyph = glyphTable.getGlyph(index, level);
                 if (glyph != null)
                 {
                     descriptions.put(index, glyph.getDescription());

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java?rev=1917925&r1=1917924&r2=1917925&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphData.java Thu May 23 15:19:58 2024
@@ -42,9 +42,11 @@ public class GlyphData
      * @param glyphTable The glyph table this glyph belongs to.
      * @param data The stream to read the data from.
      * @param leftSideBearing The left side bearing for this glyph.
+     * @param level composite level
      * @throws IOException If there is an error reading the data.
      */
-    void initData( GlyphTable glyphTable, TTFDataStream data, int leftSideBearing ) throws IOException
+    void initData( GlyphTable glyphTable, TTFDataStream data, int leftSideBearing, int level)
+            throws IOException
     {
         numberOfContours = data.readSignedShort();
         xMin = data.readSignedShort();
@@ -62,7 +64,7 @@ public class GlyphData
         else 
         {
             // create a composite glyph
-            glyphDescription = new GlyfCompositeDescript(data, glyphTable);
+            glyphDescription = new GlyfCompositeDescript(data, glyphTable, level + 1);
         }
     }
 

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphTable.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphTable.java?rev=1917925&r1=1917924&r2=1917925&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphTable.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphTable.java Thu May 23 15:19:58 2024
@@ -42,6 +42,7 @@ public class GlyphTable extends TTFTable
     private int cached = 0;
 
     private HorizontalMetricsTable hmt = null;
+    private MaximumProfileTable maxp = null;
 
     /**
      * Don't even bother to cache huge fonts.
@@ -55,7 +56,6 @@ public class GlyphTable extends TTFTable
 
     GlyphTable()
     {
-        super();
     }
 
     /**
@@ -87,6 +87,8 @@ public class GlyphTable extends TTFTable
         // locks TrueTypeFont and then tries to lock "data"
         hmt = ttf.getHorizontalMetrics();
 
+        maxp = ttf.getMaximumProfile();
+
         initialized = true;
     }
 
@@ -109,6 +111,11 @@ public class GlyphTable extends TTFTable
      */
     public GlyphData getGlyph(int gid) throws IOException
     {
+        return getGlyph(gid, 0);
+    }
+
+    GlyphData getGlyph(int gid, int level) throws IOException
+    {
         if (gid < 0 || gid >= numGlyphs)
         {
             return null;
@@ -143,7 +150,7 @@ public class GlyphTable extends TTFTable
 
                 data.seek(offsets[gid]);
 
-                glyph = getGlyphData(gid);
+                glyph = getGlyphData(gid, level);
 
                 // restore
                 data.seek(currentPosition);
@@ -159,11 +166,15 @@ public class GlyphTable extends TTFTable
         }
     }
 
-    private GlyphData getGlyphData(int gid) throws IOException
+    private GlyphData getGlyphData(int gid, int level) throws IOException
     {
+        if (level > maxp.getMaxComponentDepth())
+        {
+            throw new IOException("composite glyph maximum level reached");
+        }
         GlyphData glyph = new GlyphData();
         int leftSideBearing = hmt == null ? 0 : hmt.getLeftSideBearing(gid);
-        glyph.initData(this, data, leftSideBearing);
+        glyph.initData(this, data, leftSideBearing, level);
         // resolve composite glyph
         if (glyph.getDescription().isComposite())
         {