octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2025-02-02 20:08:24 +00:00
Code Issues Releases Wiki Activity

Fix seg fault on empty xref stream (fixes #263)

Browse Source 
Thanks to @p-cher for supplying a patch.
This commit is contained in:
Jay Berkenbilt 2019-01-03 09:16:53 -05:00
parent f78ea057ca
commit 3e74916c5a
4 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libqpdf/QPDF.cc
View File

@ -1228,7 +1228,11 @@ QPDF::getObjectCount()
{ {
o1 = (*(this->m->obj_cache.rbegin())).first; o1 = (*(this->m->obj_cache.rbegin())).first;
} }
QPDFObjGen o2 = (*(this->m->xref_table.rbegin())).first; QPDFObjGen o2(0, 0);
if (! this->m->xref_table.empty())
{
o2 = (*(this->m->xref_table.rbegin())).first;
}
QTC::TC("qpdf", "QPDF indirect last obj from xref", QTC::TC("qpdf", "QPDF indirect last obj from xref",
(o2.getObj() > o1.getObj()) ? 1 : 0); (o2.getObj() > o1.getObj()) ? 1 : 0);
return std::max(o1.getObj(), o2.getObj()); return std::max(o1.getObj(), o2.getObj());

1
qpdf/qtest/qpdf.test
View File

@ -450,6 +450,7 @@ my @bug_tests = (
["149", "xref prev pointer loop", 3], ["149", "xref prev pointer loop", 3],
["150", "integer overflow", 2], ["150", "integer overflow", 2],
["202", "even more deeply nested dictionary", 2], ["202", "even more deeply nested dictionary", 2],
["263", "empty xref stream", 3],
); );
$n_tests += scalar(@bug_tests); $n_tests += scalar(@bug_tests);
foreach my $d (@bug_tests) foreach my $d (@bug_tests)

38
qpdf/qtest/qpdf/issue-263.out Normal file
View File

@ -0,0 +1,38 @@
WARNING: issue-263.pdf: can't find PDF header
WARNING: issue-263.pdf: file is damaged
WARNING: issue-263.pdf: can't find startxref
WARNING: issue-263.pdf: Attempting to reconstruct cross-reference table
WARNING: issue-263.pdf (trailer, offset 66): unknown token while reading object; treating as string
WARNING: issue-263.pdf (trailer, offset 75): unknown token while reading object; treating as string
WARNING: issue-263.pdf (trailer, offset 79): unknown token while reading object; treating as string
WARNING: issue-263.pdf (trailer, offset 82): unexpected )
WARNING: issue-263.pdf (trailer, offset 83): unknown token while reading object; treating as string
WARNING: issue-263.pdf (trailer, offset 87): unexpected >
WARNING: issue-263.pdf (trailer, offset 89): unexpected dictionary close token
WARNING: issue-263.pdf (trailer, offset 92): unexpected >
WARNING: issue-263.pdf (trailer, offset 40): expected dictionary key but found non-name object; inserting key /QPDFFake1
WARNING: issue-263.pdf (trailer, offset 40): expected dictionary key but found non-name object; inserting key /QPDFFake2
WARNING: issue-263.pdf (trailer, offset 40): expected dictionary key but found non-name object; inserting key /QPDFFake3
WARNING: issue-263.pdf (trailer, offset 40): expected dictionary key but found non-name object; inserting key /QPDFFake4
WARNING: issue-263.pdf (trailer, offset 40): expected dictionary key but found non-name object; inserting key /QPDFFake5
WARNING: issue-263.pdf (trailer, offset 40): expected dictionary key but found non-name object; inserting key /QPDFFake6
WARNING: issue-263.pdf (trailer, offset 40): expected dictionary key but found non-name object; inserting key /QPDFFake7
WARNING: issue-263.pdf (trailer, offset 98): unknown token while reading object; treating as string
WARNING: issue-263.pdf (trailer, offset 103): unexpected )
WARNING: issue-263.pdf (trailer, offset 107): unknown token while reading object; treating as string
WARNING: issue-263.pdf (trailer, offset 119): expected dictionary key but found non-name object; inserting key /QPDFFake1
WARNING: issue-263.pdf (trailer, offset 163): unknown token while reading object; treating as string
WARNING: issue-263.pdf (trailer, offset 173): unknown token while reading object; treating as string
WARNING: issue-263.pdf (trailer, offset 113): expected dictionary key but found non-name object; inserting key /QPDFFake1
WARNING: issue-263.pdf (trailer, offset 113): expected dictionary key but found non-name object; inserting key /QPDFFake2
WARNING: issue-263.pdf (trailer, offset 113): dictionary ended prematurely; using null as value for last key
WARNING: issue-263.pdf (trailer, offset 18): expected dictionary key but found non-name object; inserting key /QPDFFake1
WARNING: issue-263.pdf (trailer, offset 18): expected dictionary key but found non-name object; inserting key /QPDFFake2
WARNING: issue-263.pdf (trailer, offset 18): expected dictionary key but found non-name object; inserting key /QPDFFake3
WARNING: issue-263.pdf (trailer, offset 18): expected dictionary key but found non-name object; inserting key /QPDFFake4
WARNING: issue-263.pdf (trailer, offset 18): expected dictionary key but found non-name object; inserting key /QPDFFake5
WARNING: issue-263.pdf (trailer, offset 18): expected dictionary key but found non-name object; inserting key /QPDFFake6
WARNING: issue-263.pdf (trailer, offset 18): expected dictionary key but found non-name object; inserting key /QPDFFake7
WARNING: issue-263.pdf (trailer, offset 18): expected dictionary key but found non-name object; inserting key /QPDFFake8
WARNING: issue-263.pdf (trailer, offset 18): expected dictionary key but found non-name object; inserting key /QPDFFake9
qpdf: operation succeeded with warnings; resulting file may have some problems

5
qpdf/qtest/qpdf/issue-263.pdf Normal file
View File

@ -0,0 +1,5 @@
%PDFn
trailer
<</S10/Prev 5137/Root <<5 0 R/In-2476-247682085 0 R82085 0 Rfo R/I)D[<>>7>>8>]>>
sbj 5) 0 obj <</Des<</4/Prtor 12>>/Filter/Flatode/ID[<07>]/Inf 0 R/Len50/R R/Size >>-247682085 -247682085 >>-247682085 0 R-247682085 -247682085 0 R26/Type/XRef/W[1 2 9]>>stream
h