octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 10:58:58 +00:00
Code Issues Releases Wiki Activity

In QPDF::damagedPDF change input parameter to InputSource&

Browse Source
This commit is contained in:
m-holger 2024-08-21 11:14:39 +01:00
parent 7f3b05ddb4
commit 20edfb3f91
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/qpdf/QPDF.hh
View File

@ -1088,14 +1088,11 @@ class QPDF
qpdf_offset_t end_before_space, qpdf_offset_t end_before_space,
qpdf_offset_t end_after_space); qpdf_offset_t end_after_space);
static QPDFExc damagedPDF( static QPDFExc damagedPDF(
std::shared_ptr<InputSource> const& input, InputSource& input,
std::string const& object, std::string const& object,
qpdf_offset_t offset, qpdf_offset_t offset,
std::string const& message); std::string const& message);
QPDFExc damagedPDF( QPDFExc damagedPDF(InputSource& input, qpdf_offset_t offset, std::string const& message);
std::shared_ptr<InputSource> const& input,
qpdf_offset_t offset,
std::string const& message);
QPDFExc damagedPDF(std::string const& object, qpdf_offset_t offset, std::string const& message); QPDFExc damagedPDF(std::string const& object, qpdf_offset_t offset, std::string const& message);
QPDFExc damagedPDF(std::string const& object, std::string const& message); QPDFExc damagedPDF(std::string const& object, std::string const& message);
QPDFExc damagedPDF(qpdf_offset_t offset, std::string const& message); QPDFExc damagedPDF(qpdf_offset_t offset, std::string const& message);

32
libqpdf/QPDF.cc
View File

@ -1493,7 +1493,7 @@ QPDF::readObject(std::string const& description, QPDFObjGen og)
if (empty) { if (empty) {
// Nothing in the PDF spec appears to allow empty objects, but they have been encountered in // 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. // actual PDF files and Adobe Reader appears to ignore them.
warn(damagedPDF(m->file, m->file->getLastOffset(), "empty object treated as null")); warn(damagedPDF(*m->file, m->file->getLastOffset(), "empty object treated as null"));
return object; return object;
} }
auto token = readToken(m->file); auto token = readToken(m->file);
@ -1613,7 +1613,7 @@ QPDF::readObjectInStream(std::shared_ptr<InputSource>& input, int obj)
if (empty) { if (empty) {
// Nothing in the PDF spec appears to allow empty objects, but they have been encountered in // 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. // actual PDF files and Adobe Reader appears to ignore them.
warn(damagedPDF(input, input->getLastOffset(), "empty object treated as null")); warn(damagedPDF(*input, input->getLastOffset(), "empty object treated as null"));
} }
return object; return object;
} }
@ -1635,7 +1635,7 @@ QPDF::recoverStreamLength(
std::shared_ptr<InputSource> input, QPDFObjGen const& og, qpdf_offset_t stream_offset) std::shared_ptr<InputSource> input, QPDFObjGen const& og, qpdf_offset_t stream_offset)
{ {
// Try to reconstruct stream length by looking for endstream or endobj // Try to reconstruct stream length by looking for endstream or endobj
warn(damagedPDF(input, stream_offset, "attempting to recover stream length")); warn(damagedPDF(*input, stream_offset, "attempting to recover stream length"));
PatternFinder ef(*this, &QPDF::findEndstream); PatternFinder ef(*this, &QPDF::findEndstream);
size_t length = 0; size_t length = 0;
@ -1674,10 +1674,10 @@ QPDF::recoverStreamLength(
if (length == 0) { if (length == 0) {
warn(damagedPDF( warn(damagedPDF(
input, stream_offset, "unable to recover stream data; treating stream as empty")); *input, stream_offset, "unable to recover stream data; treating stream as empty"));
} else { } else {
warn( warn(damagedPDF(
damagedPDF(input, stream_offset, "recovered stream length: " + std::to_string(length))); *input, stream_offset, "recovered stream length: " + std::to_string(length)));
} }
QTC::TC("qpdf", "QPDF recovered stream length"); QTC::TC("qpdf", "QPDF recovered stream length");
@ -1958,7 +1958,7 @@ QPDF::resolveObjectsInStream(int obj_stream_number)
QPDFTokenizer::Token toffset = readToken(input); QPDFTokenizer::Token toffset = readToken(input);
if (!(tnum.isInteger() && toffset.isInteger())) { if (!(tnum.isInteger() && toffset.isInteger())) {
throw damagedPDF( throw damagedPDF(
input, *input,
m->last_object_description, m->last_object_description,
input->getLastOffset(), input->getLastOffset(),
"expected integer in object stream header"); "expected integer in object stream header");
@ -1972,7 +1972,7 @@ QPDF::resolveObjectsInStream(int obj_stream_number)
if (num == obj_stream_number) { if (num == obj_stream_number) {
QTC::TC("qpdf", "QPDF ignore self-referential object stream"); QTC::TC("qpdf", "QPDF ignore self-referential object stream");
warn(damagedPDF( warn(damagedPDF(
input, *input,
m->last_object_description, m->last_object_description,
input->getLastOffset(), input->getLastOffset(),
"object stream claims to contain itself")); "object stream claims to contain itself"));
@ -2726,7 +2726,7 @@ QPDF::pipeStreamData(
file->seek(offset, SEEK_SET); file->seek(offset, SEEK_SET);
auto buf = std::make_unique<char[]>(length); auto buf = std::make_unique<char[]>(length);
if (auto read = file->read(buf.get(), length); read != length) { if (auto read = file->read(buf.get(), length); read != length) {
throw damagedPDF(file, "", offset + toO(read), "unexpected EOF reading stream data"); throw damagedPDF(*file, "", offset + toO(read), "unexpected EOF reading stream data");
} }
pipeline->write(buf.get(), length); pipeline->write(buf.get(), length);
attempted_finish = true; attempted_finish = true;
@ -2742,7 +2742,7 @@ QPDF::pipeStreamData(
qpdf_for_warning.warn( qpdf_for_warning.warn(
// line-break // line-break
damagedPDF( damagedPDF(
file, *file,
"", "",
file->getLastOffset(), file->getLastOffset(),
("error decoding stream data for object " + og.unparse(' ') + ": " + ("error decoding stream data for object " + og.unparse(' ') + ": " +
@ -2751,7 +2751,7 @@ QPDF::pipeStreamData(
qpdf_for_warning.warn( qpdf_for_warning.warn(
// line-break // line-break
damagedPDF( damagedPDF(
file, *file,
"", "",
file->getLastOffset(), file->getLastOffset(),
"stream will be re-processed without filtering to avoid data loss")); "stream will be re-processed without filtering to avoid data loss"));
@ -2825,19 +2825,15 @@ QPDF::stopOnError(std::string const& message)
// Return an exception of type qpdf_e_damaged_pdf. // Return an exception of type qpdf_e_damaged_pdf.
QPDFExc QPDFExc
QPDF::damagedPDF( QPDF::damagedPDF(
std::shared_ptr<InputSource> const& input, InputSource& input, std::string const& object, qpdf_offset_t offset, std::string const& message)
std::string const& object,
qpdf_offset_t offset,
std::string const& message)
{ {
return {qpdf_e_damaged_pdf, input->getName(), object, offset, message}; return {qpdf_e_damaged_pdf, input.getName(), object, offset, message};
} }
// Return an exception of type qpdf_e_damaged_pdf. The object is taken from // Return an exception of type qpdf_e_damaged_pdf. The object is taken from
// m->last_object_description. // m->last_object_description.
QPDFExc QPDFExc
QPDF::damagedPDF( QPDF::damagedPDF(InputSource& input, qpdf_offset_t offset, std::string const& message)
std::shared_ptr<InputSource> const& input, qpdf_offset_t offset, std::string const& message)
{ {
return damagedPDF(input, m->last_object_description, offset, message); return damagedPDF(input, m->last_object_description, offset, message);
} }