diff options
| -rw-r--r-- | include/qpdf/QPDF.hh | 1 | ||||
| -rw-r--r-- | libqpdf/QPDF.cc | 22 |
2 files changed, 22 insertions, 1 deletions
diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh index e15b4443..beb98f0b 100644 --- a/include/qpdf/QPDF.hh +++ b/include/qpdf/QPDF.hh @@ -1011,6 +1011,7 @@ class QPDF std::string const& description, QPDFObjGen const& og, bool in_object_stream); + QPDFObjectHandle readObjectInStream(std::shared_ptr<InputSource>, QPDFObjGen og); size_t recoverStreamLength( std::shared_ptr<InputSource> input, QPDFObjGen const& og, qpdf_offset_t stream_offset); QPDFTokenizer::Token readToken(std::shared_ptr<InputSource>, size_t max_len = 0); diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index 9554027c..cfa22730 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -1389,6 +1389,26 @@ QPDF::readObject( return object; } +QPDFObjectHandle +QPDF::readObjectInStream(std::shared_ptr<InputSource> input, QPDFObjGen og) +{ + setLastObjectDescription("", og); + qpdf_offset_t offset = input->tell(); + + bool empty = false; + auto object = QPDFParser(input, m->last_object_description, m->tokenizer, nullptr, this) + .parse(empty, false); + if (empty) { + // Nothing in the PDF spec appears to allow empty objects, but they have been encountered in + // actual PDF files and Adobe Reader appears to ignore them. + warn(damagedPDF(input, input->getLastOffset(), "empty object treated as null")); + } + + // Override last_offset so that it points to the beginning of the object we just read + input->setLastOffset(offset); + return object; +} + bool QPDF::findEndstream() { @@ -1750,7 +1770,7 @@ QPDF::resolveObjectsInStream(int obj_stream_number) if ((entry.getType() == 2) && (entry.getObjStreamNumber() == obj_stream_number)) { int offset = iter.second; input->seek(offset, SEEK_SET); - QPDFObjectHandle oh = readObject(input, "", og, true); + QPDFObjectHandle oh = readObjectInStream(input, og); updateCache(og, oh.getObj(), end_before_space, end_after_space); } else { QTC::TC("qpdf", "QPDF not caching overridden objstm object"); |