From b62367ae51d47b41be45351520e2e6ce3ae14717 Mon Sep 17 00:00:00 2001 From: m-holger Date: Fri, 31 Oct 2025 17:02:32 +0000 Subject: [PATCH] Remove `QPDF::initializeEncryption`. --- libqpdf/QPDF_objects.cc | 10 ++++------ qpdf/qpdf.testcov | 1 - 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/libqpdf/QPDF_objects.cc b/libqpdf/QPDF_objects.cc index fbe4f19..94b3e69 100644 --- a/libqpdf/QPDF_objects.cc +++ b/libqpdf/QPDF_objects.cc @@ -227,7 +227,7 @@ Objects::parse(char const* password) } } - qpdf.initializeEncryption(); + m->encp->initialize(qpdf); m->parsed = true; if (!m->xref_table.empty() && !qpdf.getRoot().getKey("/Pages").isDictionary()) { // QPDFs created from JSON have an empty xref table and no root object yet. @@ -334,15 +334,13 @@ Objects::reconstruct_xref(QPDFExc& e, bool found_startxref) auto xref_backup{m->xref_table}; try { m->file->seek(startxrefs.back(), SEEK_SET); - if (auto offset = - QUtil::string_to_ll(m->objects.readToken(*m->file).getValue().data())) { - m->objects.read_xref(offset); + if (auto offset = QUtil::string_to_ll(readToken(*m->file).getValue().data())) { + read_xref(offset); if (qpdf.getRoot().getKey("/Pages").isDictionary()) { - QTC::TC("qpdf", "QPDF startxref more than 1024 before end"); warn(damagedPDF( "", -1, "startxref was more than 1024 bytes before end of file")); - qpdf.initializeEncryption(); + m->encp->initialize(qpdf); m->parsed = true; m->reconstructed_xref = false; return; diff --git a/qpdf/qpdf.testcov b/qpdf/qpdf.testcov index 1af0a37..92428c5 100644 --- a/qpdf/qpdf.testcov +++ b/qpdf/qpdf.testcov @@ -27,7 +27,6 @@ main QTest stream 0 QPDF lin write nshared_total > nshared_first_page 1 QPDFWriter encrypted hint stream 0 QPDF xref gen > 0 1 -QPDF startxref more than 1024 before end 0 QPDFParser bad brace 0 QPDFParser bad brace in parseRemainder 0 QPDFParser bad array close 0 -- libgit2 0.21.4