octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-11-11 07:30:57 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1035 from m-holger/fix

Browse Source 
Fix #1028
This commit is contained in:
Jay Berkenbilt 2023-09-05 13:37:10 -04:00 committed by GitHub
commit 105093ae18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 811 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libqpdf/QPDF.cc
View File

@ -2058,27 +2058,27 @@ QPDF::reserveObjects(QPDFObjectHandle foreign, ObjCopier& obj_copier, bool top)
if (foreign.isIndirect()) { if (foreign.isIndirect()) {
QPDFObjGen foreign_og(foreign.getObjGen()); QPDFObjGen foreign_og(foreign.getObjGen());
if (!obj_copier.visiting.add(foreign_og)) {
QTC::TC("qpdf", "QPDF loop reserving objects");
return;
}
if (obj_copier.object_map.count(foreign_og) > 0) { if (obj_copier.object_map.count(foreign_og) > 0) {
QTC::TC("qpdf", "QPDF already reserved object"); QTC::TC("qpdf", "QPDF already reserved object");
if (obj_copier.visiting.count(foreign_og)) { if (!(top && foreign.isPageObject() && obj_copier.object_map[foreign_og].isNull())) {
QTC::TC("qpdf", "QPDF loop reserving objects"); obj_copier.visiting.erase(foreign);
}
return;
}
if (!obj_copier.visiting.add(foreign_og)) {
return; return;
} }
} else {
QTC::TC("qpdf", "QPDF copy indirect"); QTC::TC("qpdf", "QPDF copy indirect");
if (obj_copier.object_map.count(foreign_og) == 0) {
obj_copier.object_map[foreign_og] = obj_copier.object_map[foreign_og] =
foreign.isStream() ? newStream() : newIndirectNull(); foreign.isStream() ? newStream() : newIndirectNull();
if ((!top) && foreign.isPageObject()) { if ((!top) && foreign.isPageObject()) {
QTC::TC("qpdf", "QPDF not crossing page boundary"); QTC::TC("qpdf", "QPDF not crossing page boundary");
obj_copier.visiting.erase(foreign); obj_copier.visiting.erase(foreign_og);
return; return;
} }
obj_copier.to_copy.push_back(foreign);
} }
obj_copier.to_copy.push_back(foreign);
} }
if (foreign_tc == ::ot_array) { if (foreign_tc == ::ot_array) {

11
qpdf/qtest/copy-annotations.test
View File

@ -14,7 +14,7 @@ cleanup();
my $td = new TestDriver('copy-annotations'); my $td = new TestDriver('copy-annotations');
my $n_tests = 43; my $n_tests = 45;
$td->runtest("complex copy annotations", $td->runtest("complex copy annotations",
{$td->COMMAND => {$td->COMMAND =>
@ -206,5 +206,14 @@ $td->runtest("check output",
{$td->FILE => "split-out-1.pdf"}, {$td->FILE => "split-out-1.pdf"},
{$td->FILE => "direct-dr-out.pdf"}); {$td->FILE => "direct-dr-out.pdf"});
$td->runtest("Foreign link annotations",
{$td->COMMAND =>
"qpdf --empty --pages link-annots.pdf -- --qdf --static-id --no-original-object-ids a.pdf"},
{$td->STRING => "", $td->EXIT_STATUS => 0},
$td->NORMALIZE_NEWLINES);
$td->runtest("check output",
{$td->FILE => "link-annots.pdf"},
{$td->FILE => "a.pdf"});
cleanup(); cleanup();
$td->report($n_tests); $td->report($n_tests);

790
qpdf/qtest/qpdf/link-annots.pdf Normal file
View File

@ -0,0 +1,790 @@
%PDF-1.6
%¿÷¢þ
%QDF-1.0
1 0 obj
<<
/Pages 2 0 R
/Type /Catalog
>>
endobj
2 0 obj
<<
/Count 4
/Kids [
3 0 R
4 0 R
5 0 R
6 0 R
]
/Type /Pages
>>
endobj
%% Page 1
3 0 obj
<<
/Annots [
7 0 R
8 0 R
9 0 R
10 0 R
]
/Contents 11 0 R
/Group <<
/CS /DeviceRGB
/I true
/S /Transparency
>>
/MediaBox [
0
0
612
792
]
/Parent 2 0 R
/Resources <<
/Font <<
/F2 13 0 R
>>
/ProcSet [
/PDF
/Text
]
>>
/Type /Page
>>
endobj
%% Page 2
4 0 obj
<<
/Annots [
14 0 R
15 0 R
16 0 R
17 0 R
]
/Contents 18 0 R
/Group <<
/CS /DeviceRGB
/I true
/S /Transparency
>>
/MediaBox [
0
0
612
792
]
/Parent 2 0 R
/Resources <<
/Font <<
/F2 13 0 R
>>
/ProcSet [
/PDF
/Text
]
>>
/Type /Page
>>
endobj
%% Page 3
5 0 obj
<<
/Annots [
20 0 R
21 0 R
22 0 R
23 0 R
]
/Contents 24 0 R
/Group <<
/CS /DeviceRGB
/I true
/S /Transparency
>>
/MediaBox [
0
0
612
792
]
/Parent 2 0 R
/Resources <<
/Font <<
/F2 13 0 R
>>
/ProcSet [
/PDF
/Text
]
>>
/Type /Page
>>
endobj
%% Page 4
6 0 obj
<<
/Annots [
26 0 R
27 0 R
28 0 R
29 0 R
]
/Contents 30 0 R
/Group <<
/CS /DeviceRGB
/I true
/S /Transparency
>>
/MediaBox [
0
0
612
792
]
/Parent 2 0 R
/Resources <<
/Font <<
/F2 13 0 R
>>
/ProcSet [
/PDF
/Text
]
>>
/Type /Page
>>
endobj
7 0 obj
<<
/Border [
0
0
0
]
/Dest [
3 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
695
100
708
]
/Subtype /Link
/Type /Annot
>>
endobj
8 0 obj
<<
/Border [
0
0
0
]
/Dest [
4 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
645
100
658
]
/Subtype /Link
/Type /Annot
>>
endobj
9 0 obj
<<
/Border [
0
0
0
]
/Dest [
5 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
595
100
608
]
/Subtype /Link
/Type /Annot
>>
endobj
10 0 obj
<<
/Border [
0
0
0
]
/Dest [
6 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
545
100
558
]
/Subtype /Link
/Type /Annot
>>
endobj
%% Contents for page 1
11 0 obj
<<
/Length 12 0 R
>>
stream
0.1 w
q 0 0 0 rg
BT
55 750 Td /F2 18 Tf (Page 1) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 700 Td /F2 12 Tf (Page 1) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 650 Td /F2 12 Tf (Page 2) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 600 Td /F2 12 Tf (Page 3) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 550 Td /F2 12 Tf (Page 4) Tj
ET
Q
endstream
endobj
12 0 obj
314
endobj
13 0 obj
<<
/BaseFont /Courier
/Subtype /TrueType
/Type /Font
>>
endobj
14 0 obj
<<
/Border [
0
0
0
]
/Dest [
3 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
695
100
708
]
/Subtype /Link
/Type /Annot
>>
endobj
15 0 obj
<<
/Border [
0
0
0
]
/Dest [
4 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
645
100
658
]
/Subtype /Link
/Type /Annot
>>
endobj
16 0 obj
<<
/Border [
0
0
0
]
/Dest [
5 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
595
100
608
]
/Subtype /Link
/Type /Annot
>>
endobj
17 0 obj
<<
/Border [
0
0
0
]
/Dest [
6 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
545
100
558
]
/Subtype /Link
/Type /Annot
>>
endobj
%% Contents for page 2
18 0 obj
<<
/Length 19 0 R
>>
stream
0.1 w
q 0 0 0 rg
BT
55 750 Td /F2 18 Tf (Page 2) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 700 Td /F2 12 Tf (Page 1) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 650 Td /F2 12 Tf (Page 2) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 600 Td /F2 12 Tf (Page 3) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 550 Td /F2 12 Tf (Page 4) Tj
ET
Q
endstream
endobj
19 0 obj
314
endobj
20 0 obj
<<
/Border [
0
0
0
]
/Dest [
3 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
695
100
708
]
/Subtype /Link
/Type /Annot
>>
endobj
21 0 obj
<<
/Border [
0
0
0
]
/Dest [
4 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
645
100
658
]
/Subtype /Link
/Type /Annot
>>
endobj
22 0 obj
<<
/Border [
0
0
0
]
/Dest [
5 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
595
100
608
]
/Subtype /Link
/Type /Annot
>>
endobj
23 0 obj
<<
/Border [
0
0
0
]
/Dest [
6 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
545
100
558
]
/Subtype /Link
/Type /Annot
>>
endobj
%% Contents for page 3
24 0 obj
<<
/Length 25 0 R
>>
stream
0.1 w
q 0 0 0 rg
BT
55 750 Td /F2 18 Tf (Page 3) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 700 Td /F2 12 Tf (Page 1) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 650 Td /F2 12 Tf (Page 2) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 600 Td /F2 12 Tf (Page 3) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 550 Td /F2 12 Tf (Page 4) Tj
ET
Q
endstream
endobj
25 0 obj
314
endobj
26 0 obj
<<
/Border [
0
0
0
]
/Dest [
3 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
695
100
708
]
/Subtype /Link
/Type /Annot
>>
endobj
27 0 obj
<<
/Border [
0
0
0
]
/Dest [
4 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
645
100
658
]
/Subtype /Link
/Type /Annot
>>
endobj
28 0 obj
<<
/Border [
0
0
0
]
/Dest [
5 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
595
100
608
]
/Subtype /Link
/Type /Annot
>>
endobj
29 0 obj
<<
/Border [
0
0
0
]
/Dest [
6 0 R
/XYZ
56.7
773.189
0
]
/Rect [
54
545
100
558
]
/Subtype /Link
/Type /Annot
>>
endobj
%% Contents for page 4
30 0 obj
<<
/Length 31 0 R
>>
stream
0.1 w
q 0 0 0 rg
BT
55 750 Td /F2 18 Tf (Page 4) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 700 Td /F2 12 Tf (Page 1) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 650 Td /F2 12 Tf (Page 2) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 600 Td /F2 12 Tf (Page 3) Tj
ET
Q
q 0 0 0.5019607843 rg
BT
55 550 Td /F2 12 Tf (Page 4) Tj
ET
Q
endstream
endobj
31 0 obj
314
endobj
xref
0 32
0000000000 65535 f
0000000025 00000 n
0000000079 00000 n
0000000191 00000 n
0000000546 00000 n
0000000904 00000 n
0000001262 00000 n
0000001610 00000 n
0000001803 00000 n
0000001996 00000 n
0000002189 00000 n
0000002406 00000 n
0000002777 00000 n
0000002798 00000 n
0000002877 00000 n
0000003071 00000 n
0000003265 00000 n
0000003459 00000 n
0000003676 00000 n
0000004047 00000 n
0000004068 00000 n
0000004262 00000 n
0000004456 00000 n
0000004650 00000 n
0000004867 00000 n
0000005238 00000 n
0000005259 00000 n
0000005453 00000 n
0000005647 00000 n
0000005841 00000 n
0000006058 00000 n
0000006429 00000 n
trailer <<
/Root 1 0 R
/Size 32
/ID [<31415926535897932384626433832795><31415926535897932384626433832795>]
>>
startxref
6450
%%EOF