lsm/PdfPig
1
0
Fork 0
mirror of https://github.com/UglyToad/PdfPig.git synced 2025-09-19 10:47:56 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

handle case where xref has multiple parts with incorrect offset #352

Browse Source
This commit is contained in:
Eliot Jones
2021-08-06 19:47:54 -04:00
parent 72db3bf244
commit dd95b38345
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/UglyToad.PdfPig/CrossReference/CrossReferenceTableBuilder.cs
View File

@@ -28,7 +28,7 @@
parts.Add(part); parts.Add(part);
} }
public CrossReferenceTable Build(long firstCrossReferenceOffset, ILog log) public CrossReferenceTable Build(long firstCrossReferenceOffset, long offsetCorrection, ILog log)
{ {
CrossReferenceType type = CrossReferenceType.Table; CrossReferenceType type = CrossReferenceType.Table;
DictionaryToken trailerDictionary = new DictionaryToken(new Dictionary<NameToken, IToken>()); DictionaryToken trailerDictionary = new DictionaryToken(new Dictionary<NameToken, IToken>());
@@ -65,7 +65,7 @@
break; break;
} }
currentPart = parts.FirstOrDefault(x => x.Offset == prevBytePos); currentPart = parts.FirstOrDefault(x => x.Offset == prevBytePos || x.Offset == prevBytePos + offsetCorrection);
if (currentPart == null) if (currentPart == null)
{ {
log.Warn("Did not found XRef object pointed to by 'Prev' key at position " + prevBytePos); log.Warn("Did not found XRef object pointed to by 'Prev' key at position " + prevBytePos);
@@ -88,7 +88,7 @@
// merge used and sorted XRef/trailer // merge used and sorted XRef/trailer
foreach (long bPos in xrefSeqBytePos) foreach (long bPos in xrefSeqBytePos)
{ {
var currentObject = parts.First(x => x.Offset == bPos); var currentObject = parts.First(x => x.Offset == bPos || x.Offset == bPos + offsetCorrection);
if (currentObject.Dictionary != null) if (currentObject.Dictionary != null)
{ {
foreach (var entry in currentObject.Dictionary.Data) foreach (var entry in currentObject.Dictionary.Data)

2
src/UglyToad.PdfPig/Parser/FileStructure/CrossReferenceParser.cs
View File

@@ -207,7 +207,7 @@
throw new PdfDocumentFormatException("The cross reference was not found."); throw new PdfDocumentFormatException("The cross reference was not found.");
} }
var resolved = table.Build(crossReferenceLocation, log); var resolved = table.Build(crossReferenceLocation, offsetCorrection, log);
// check the offsets of all referenced objects // check the offsets of all referenced objects
if (!CrossReferenceObjectOffsetValidator.ValidateCrossReferenceOffsets(bytes, resolved, log, out var actualOffsets)) if (!CrossReferenceObjectOffsetValidator.ValidateCrossReferenceOffsets(bytes, resolved, log, out var actualOffsets))