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

Refactor QPDF::findEndstream

Browse Source 
Leave input source correctly positioned to find 'endobj' next.
This commit is contained in:
m-holger 2024-10-31 13:31:07 +00:00
parent aa7527a481
commit 780a05735c
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libqpdf/QPDF_objects.cc
View File

@ -1393,12 +1393,16 @@ Objects::readObjectInStream(std::shared_ptr<InputSource>& input, int obj)
return object; return object;
} }
// Find endstream or endobj. If found, position the input at the end of endstream or the beginning
// of endobj. In either case, last offset is at the beginning of the token.
bool bool
QPDF::findEndstream() QPDF::findEndstream()
{ {
// Find endstream or endobj. Position the input at that token. auto t = readToken(*m->file, 10);
auto t = readToken(*m->file, 20); if (t.isWord("endstream")) {
if (t.isWord("endobj") || t.isWord("endstream")) { return true;
}
if (t.isWord("endobj")) {
m->file->seek(m->file->getLastOffset(), SEEK_SET); m->file->seek(m->file->getLastOffset(), SEEK_SET);
return true; return true;
} }
@ -1414,12 +1418,7 @@ Objects::recover_stream_length(QPDFObjGen og, qpdf_offset_t stream_offset)
PatternFinder ef(qpdf, &QPDF::findEndstream); PatternFinder ef(qpdf, &QPDF::findEndstream);
size_t length = 0; size_t length = 0;
if (m->file->findFirst("end", stream_offset, 0, ef)) { if (m->file->findFirst("end", stream_offset, 0, ef)) {
length = toS(m->file->tell() - stream_offset); length = toS(m->file->getLastOffset() - stream_offset);
// Reread endstream but, if it was endobj, don't skip that.
QPDFTokenizer::Token t = qpdf.readToken(*m->file);
if (t.getValue() == "endobj") {
m->file->seek(m->file->getLastOffset(), SEEK_SET);
}
} }
if (length) { if (length) {