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/06/19 15:35:54 UTC
svn commit: r1918449 - /pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
Author: tilman
Date: Wed Jun 19 15:35:54 2024
New Revision: 1918449
URL: http://svn.apache.org/viewvc?rev=1918449&view=rev
Log:
PDFBOX-5843: fix last commit, check that at least one private dict contains something
Modified:
pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
Modified: pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java?rev=1918449&r1=1918448&r2=1918449&view=diff
==============================================================================
--- pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java (original)
+++ pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java Wed Jun 19 15:35:54 2024
@@ -691,6 +691,7 @@ public class CFFParser
List<Map<String, Object>> privateDictionaries = new LinkedList<>();
List<Map<String, Object>> fontDictionaries = new LinkedList<>();
+ boolean privateDictPopulated = false;
for (byte[] bytes : fdIndex)
{
DataInputByteArray fontDictInput = new DataInputByteArray(bytes);
@@ -720,6 +721,7 @@ public class CFFParser
DictData privateDict = readDictData(input, privateOffset, privateSize);
// populate private dict
+ privateDictPopulated = true;
Map<String, Object> privDict = readPrivateDict(privateDict);
privateDictionaries.add(privDict);
@@ -731,8 +733,8 @@ public class CFFParser
privDict.put("Subrs", readIndexData(input));
}
}
-
- if (privateDictionaries.isEmpty())
+
+ if (!privateDictPopulated)
{
throw new IOException("Font DICT invalid without \"Private\" entry");
}