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

Track IndirectReference instead of only ObjectNumber when checking for cycles during indirect reference resolutionv and add test

Browse Source
This commit is contained in:
BobLd 2025-07-20 18:27:51 +01:00
parent 2b11961c8c
commit 813d3baa18
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/UglyToad.PdfPig.Tests/Integration/GithubIssuesTests.cs
View File

@ -7,6 +7,27 @@
public class GithubIssuesTests
{
[Fact]
public void Issue1096()
{
// Ensure no StackOverflowException
// (already fixed by https://github.com/UglyToad/PdfPig/pull/1097)
var path = IntegrationHelpers.GetSpecificTestDocumentPath("issue_1096.pdf");
using (var document = PdfDocument.Open(path, new ParsingOptions() { UseLenientParsing = true }))
{
for (int p = 1; p <= document.NumberOfPages; p++)
{
var page = document.GetPage(p);
foreach (var image in page.GetImages())
{
Assert.NotNull(image);
}
}
}
}
[Fact]
public void Issue1067()
{

BIN
src/UglyToad.PdfPig.Tests/Integration/SpecificTestDocuments/issue_1096.pdf Normal file
View File

Binary file not shown.

8
src/UglyToad.PdfPig/PdfExtensions.cs
View File

@ -122,12 +122,12 @@
/// Returns an equivalent token where any indirect references of child objects are
/// recursively traversed and resolved.
/// </summary>
internal static T? Resolve<T>(this T? token, IPdfTokenScanner scanner, List<long>? visited = null) where T : IToken
internal static T? Resolve<T>(this T? token, IPdfTokenScanner scanner, List<IndirectReference>? visited = null) where T : IToken
{
return (T?)ResolveInternal(token, scanner, visited ?? []);
}
private static IToken? ResolveInternal(this IToken? token, IPdfTokenScanner scanner, List<long> visited)
private static IToken? ResolveInternal(this IToken? token, IPdfTokenScanner scanner, List<IndirectReference> visited)
{
if (token is StreamToken stream)
{
@ -142,12 +142,12 @@
var value = kvp.Value;
if (kvp.Value is IndirectReferenceToken reference)
{
if (visited.Contains(reference.Data.ObjectNumber))
if (visited.Contains(reference.Data))
{
continue;
}
value = scanner.Get(reference.Data)?.Data;
visited.Add(reference.Data.ObjectNumber);
visited.Add(reference.Data);
}
resolvedItems[NameToken.Create(kvp.Key)] = ResolveInternal(value, scanner, visited);
}