Author: tilman
Date: Wed Nov 12 12:42:41 2025
New Revision: 1929684
Log:
PDFBOX-5660: simplify code, as suggested by Valery Bokov; closes #329
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BruteForceParser.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BruteForceParser.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BruteForceParser.java
Wed Nov 12 10:37:34 2025 (r1929683)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BruteForceParser.java
Wed Nov 12 12:42:41 2025 (r1929684)
@@ -417,23 +417,17 @@ public class BruteForceParser
{
trailer.setItem(COSName.ROOT, rootObj);
trailer.setItem(COSName.INFO, infoObj);
- if (trailerDict.containsKey(COSName.ENCRYPT))
+ COSObject encObj =
trailerDict.getCOSObject(COSName.ENCRYPT);
+ // check if the dictionary can be dereferenced
+ // TODO check if the dictionary is an encryption
dictionary?
+ if (encObj != null && encObj.getObject() instanceof
COSDictionary)
{
- COSObject encObj =
trailerDict.getCOSObject(COSName.ENCRYPT);
- // check if the dictionary can be dereferenced
- // TODO check if the dictionary is an encryption
dictionary?
- if (encObj != null && encObj.getObject() instanceof
COSDictionary)
- {
- trailer.setItem(COSName.ENCRYPT, encObj);
- }
+ trailer.setItem(COSName.ENCRYPT, encObj);
}
- if (trailerDict.containsKey(COSName.ID))
+ COSBase idObj = trailerDict.getItem(COSName.ID);
+ if (idObj instanceof COSArray)
{
- COSBase idObj = trailerDict.getItem(COSName.ID);
- if (idObj instanceof COSArray)
- {
- trailer.setItem(COSName.ID, idObj);
- }
+ trailer.setItem(COSName.ID, idObj);
}
return true;
}