2
1
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-23 03:18:59 +00:00
Commit Graph

480 Commits

Author SHA1 Message Date
m-holger
21f176d374 Add sanity check on trailer /Size entry 2024-09-20 15:28:49 +01:00
m-holger
44a1395194 Refactor QPDF::Xref_table::read_entry and read_bad_entry
Return results rather than using reference parameters.

Fixes bug in #1272 where parameters were not reinitialized when calling
read_bad_entry from read_entry.
2024-09-20 15:28:34 +01:00
m-holger
cb7180b1ba Move QPDF::ObjCache::end_before_space etc to Xref_table
Also, delay adjustments for compressed objects until needed by
linearization checks.
2024-09-18 10:25:38 +01:00
m-holger
28c13f5492 Refactor Xref_table::subsections
Optimistically read subsection headers without reading individual object
entries, assuming that they are 20 bytes long as per the PDF spec. If
problems are encountered, fall back to calling bad_subsections.
2024-09-18 10:25:38 +01:00
m-holger
ad10fa3006 Rename Xref_table::subsections to bad_subsections 2024-09-18 10:25:38 +01:00
m-holger
0f0747b3ae Refactor QPDF::getXRefTable 2024-09-18 10:25:38 +01:00
m-holger
965f0fcd63 Refactor QPDF::recoverStreamLength 2024-09-18 10:25:38 +01:00
m-holger
7775aec33e Refactor QPDFWriter::preserveObjectStreams 2024-09-18 10:25:38 +01:00
m-holger
a1b646fcca Refactor Xref_table::Entry
Replace QPDFXRefEntry with a std::variant of structs.
2024-09-18 10:25:38 +01:00
m-holger
6b9eb14c76 Remove Xref_table::deleted_objects 2024-09-18 10:25:38 +01:00
m-holger
c0020cb17d Change Xref_table::table to std::vector
Temporarily disable 3 specific-bugs tests. Remove 'xref size mismatch'
test.
2024-09-18 10:25:38 +01:00
m-holger
91822ae6a1 Refactor Xref_table::reconstruct
Split reconstruction into two passes - scanning of input for objects and
insertion of objects into the xref table. This allows insertion to take
place in the usual reverse order and removes the need for a separate
insert_reconstructed method.
2024-09-18 10:25:38 +01:00
m-holger
39df5936fe Refactor Xref_table::read_table
Rename to Xref_table::process_section.
Process trailer processing subsection entries.
2024-09-18 10:25:38 +01:00
m-holger
ed65619428 Add new methods Xref_table::subsections
Calculate all subsections before reading subsection entries.

Duplicates some warnings for the time being.
2024-09-18 10:25:38 +01:00
m-holger
cee8d5c92d Refactor Xref_table::parse_first
Rename to Xref_table::subsection.
Return results instead of using out parameters.
Take on responsibility for throwing exception and calculation of offset of
first subsection entry.
2024-09-18 10:25:38 +01:00
m-holger
0c56cec6c3 Refactor QPDF::createFromJSON 2024-09-18 10:25:38 +01:00
m-holger
88fd7ca99a Refactor QPDF::emptyPDF 2024-09-18 10:25:38 +01:00
m-holger
39abb11376 Make all QPDF::Xref_table data members private 2024-09-18 10:25:38 +01:00
m-holger
82419ca013 Add new data member QPDF::Xref_table::table 2024-09-18 10:25:38 +01:00
m-holger
742cc7d87b Add temporary methods QPDF::Xref_table::size and as_map
Also, remove redundant clearing of the xref tabl during QPDF destruction.
2024-09-18 10:25:38 +01:00
m-holger
fa03ed3891 Refactor QPDF::removeObject
Do not remove object from xref table as this is only required when the
the method is called from within QPDF::Xref_table.
2024-09-18 10:25:38 +01:00
m-holger
5fc257f0f7 Add QPDF::Xref_table methods type, offset, stream_number and stream_index 2024-09-18 10:25:38 +01:00
m-holger
d64b14912d Move QPDF::readTrailer to QPDF::Xref_table 2024-09-18 10:25:38 +01:00
m-holger
3ddc51a9dc Move QPDF::resolveXRefTable to QPDF::Xref_table 2024-09-18 10:25:38 +01:00
m-holger
ad4688866d Add new method QPDF::Xref_table::show 2024-09-18 10:25:38 +01:00
m-holger
1e2dcbf03e Add QPDF::Xref_table members file and tokenizer 2024-09-18 10:25:38 +01:00
m-holger
b1d845e708 Split QPDF member file into file and file_sp to facilitate aliasing
To be encapsulated later.
2024-09-18 10:25:37 +01:00
m-holger
db06e075ea Move xref table initialisation from QPDF::parse to QPDF::Xref_table 2024-09-18 10:25:37 +01:00
m-holger
a4db9b3149 Move QPDF::read_xref to QPDF::Xref_table 2024-09-18 10:25:37 +01:00
m-holger
f30a5eb05a Move QPDF::read_xrefStream to QPDF::Xref_table 2024-09-18 10:25:37 +01:00
m-holger
253d3aee8f Move QPDF::read_xrefEntry to QPDF::Xref_table 2024-09-18 10:25:37 +01:00
m-holger
3fbff84594 Move QPDF::reconstruct_xref to QPDF::Xref_table
Also, when recovering trailer from xref streams, pick the last valid
trailer encountered rather than the first.
2024-09-18 10:25:37 +01:00
m-holger
1e072e223a Move QPDF::insertXrefEntry etc to QPDF::Xref_table 2024-09-18 10:25:37 +01:00
m-holger
0ac37bc956 Add new class QPDF::Xref_table 2024-09-18 10:25:37 +01:00
m-holger
f8e6274a2e Move QPDF inner class definitions to new QPDF_private.hh 2024-09-18 10:25:37 +01:00
m-holger
0afaaea22a Deprecate QPDFObjectHandle::isInitialized and remove from library 2024-09-17 09:59:00 +01:00
m-holger
bcf56e5333
Merge pull request #1269 from m-holger/hybrid
Fix handling of hybrid reference files in QPDF::read_xrefTable
2024-09-17 09:50:59 +01:00
m-holger
54ac92eb1d
Merge pull request #1271 from m-holger/rsl
Fix QPDF::recoverStreamLength
2024-09-16 20:38:14 +01:00
m-holger
75091093fe
Merge pull request #1280 from m-holger/streams
Tidy QPDF_Stream
2024-09-16 19:52:24 +01:00
m-holger
5d25aac6c7 In QPDFParser constructor change input parameter to InputSource& 2024-09-05 15:30:32 +01:00
m-holger
258343fcc9 In QPDF::readToken change input parameter to InputSource& 2024-09-05 15:23:28 +01:00
m-holger
20edfb3f91 In QPDF::damagedPDF change input parameter to InputSource& 2024-09-05 15:13:30 +01:00
m-holger
83e0f8da88 Tidy QPDF_Stream
1. Make class final
2. Pass og parameter by value
3. Properly initialize qpdf and og

Also, tweak QPDF::replaceObject to allow stream replacement without
violating the requirement that streams must always be indirect objects.

Also, remove QPDF::reserveStream as it does not do what the name implies
and having this as a separate methods does not aid code readability.
2024-09-04 16:00:57 +01:00
m-holger
ef49291682 In QPDF::readObjectAtOffset fail early on 'expect n n obj' 2024-08-23 14:09:20 +01:00
m-holger
c02cb9a720 Fix QPDF::recoverStreamLength
Ensure the the recovered stream end is not part of a different object.

Test file is bad24.pdf with stream 4 'endstream' corrupted.
2024-08-20 15:14:01 +01:00
m-holger
42cd7a98ad In QPDF::recoverStreamLength mark unreachable code 2024-08-20 12:52:33 +01:00
m-holger
f2228b1f88 Fix handling of hybrid reference files in QPDF::read_xrefTable
QPDF::read_xrefTable ignores type 0 entries for objects in a section if an
associates XRefStm has an entry for the same object.

The spec states:

When the conforming reader searches for an object, if an entry is not
found in any given standard cross-reference section, the search shall
proceed to a cross-reference stream specified by the XRefStm entry
before looking in the previous cross-reference section,

If a deleted entry is found in a section, the XRefStm is not searched
according to the standard.
2024-08-16 15:58:55 +01:00
m-holger
06001ed25b Refactor the creation of unresolved objects
Create unresolved objects only for objects in the xref table (except during
parsing of the xref table). Do not add indirect nulls into the the object
cache as the result of a cache miss during a call to getObject except
during parsing or creation/updating from JSON. To support this behaviour,
add new private methods getObjectForParser and getObjectForJSON.

As a result of this change, dangling references are treated as direct nulls
rather than indirect nulls.
2024-08-06 12:22:09 +01:00
m-holger
87ee8ad071 In QPDFParser constructor add add parameter parse_pdf
Prepare for treating indirect references differently depending on whether
we are parsing a PDF file (in which case reference to objects not in the
xref table are null even if they are in the object cache) or whether parse
from user code (in which case an indirect reference can refer to a user
created object).
2024-08-06 10:02:07 +01:00
m-holger
aa4f288291 Refactor xref reconstruction
Avoid unnecessary rescanning of lines and repositioning of input file.
Limit max size of tokens.
2024-07-28 18:03:59 +01:00