lsm/PdfPig
1
0
Fork 0
mirror of https://github.com/UglyToad/PdfPig.git synced 2025-04-05 20:55:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

check for offsets exceeding file length for xref parsing #293

Browse Source
This commit is contained in:
Eliot Jones 2021-02-21 12:04:17 -04:00
parent 30dbc4cd41
commit becc772242
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/UglyToad.PdfPig/Parser/FileStructure/CrossReferenceObjectOffsetValidator.cs
View File

@ -23,6 +23,8 @@
{
return true;
}
var builderOffsets = new Dictionary<IndirectReference, long>();
var bruteForceOffsets = BruteForceSearcher.GetObjectLocations(bytes);
if (bruteForceOffsets.Count > 0)
@ -77,10 +79,11 @@
foreach (var item in bruteForceOffsets)
{
//xrefOffset[item.Key] = item.Value;
builderOffsets[item.Key] = item.Value;
}
}
actualOffsets = builderOffsets;
}
return false;
@ -131,6 +134,12 @@
try
{
if (offset >= bytes.Length)
{
bytes.Seek(originOffset);
return false;
}
bytes.Seek(offset);
if (ReadHelper.IsWhitespace(bytes.CurrentByte))

6
src/UglyToad.PdfPig/Parser/FileStructure/XrefOffsetValidator.cs
View File

@ -4,7 +4,6 @@
using System.Collections.Generic;
using Core;
using Logging;
using Parts;
using Tokenization.Scanner;
using Tokens;
@ -30,6 +29,11 @@
return startXRefOffset;
}
if (startXRefOffset >= inputBytes.Length)
{
return CalculateXRefFixedOffset(startXRefOffset, scanner, inputBytes);
}
scanner.Seek(startXRefOffset);
scanner.MoveNext();