octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-11-09 23:00:57 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1257 from m-holger/fuzz

Browse Source 
In QPDFWriter::willFilterStream remember unfilterable streams
This commit is contained in:
m-holger 2024-08-03 01:10:20 +01:00 committed by GitHub
commit 34f557a83f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libqpdf/QPDFWriter.cc
View File

@ -1236,8 +1236,8 @@ QPDFWriter::writeTrailer(
bool bool
QPDFWriter::willFilterStream( QPDFWriter::willFilterStream(
QPDFObjectHandle stream, QPDFObjectHandle stream,
bool& compress_stream, bool& compress_stream, // out only
bool& is_metadata, bool& is_metadata, // out only
std::shared_ptr<Buffer>* stream_data) std::shared_ptr<Buffer>* stream_data)
{ {
compress_stream = false; compress_stream = false;
@ -1299,9 +1299,10 @@ QPDFWriter::willFilterStream(
throw std::runtime_error( throw std::runtime_error(
"error while getting stream data for " + stream.unparse() + ": " + e.what()); "error while getting stream data for " + stream.unparse() + ": " + e.what());
} }
if (filter && (!filtered)) { if (filter && !filtered) {
// Try again // Try again
filter = false; filter = false;
stream.setFilterOnWrite(false);
} else { } else {
break; break;
} }
@ -2543,14 +2544,20 @@ QPDFWriter::writeLinearized()
{ {
// Optimize file and enqueue objects in order // Optimize file and enqueue objects in order
auto skip_stream_parameters = [this](QPDFObjectHandle& stream) { std::map<int, int> stream_cache;
auto skip_stream_parameters = [this, &stream_cache](QPDFObjectHandle& stream) {
auto& result = stream_cache[stream.getObjectID()];
if (result == 0) {
bool compress_stream; bool compress_stream;
bool is_metadata; bool is_metadata;
if (willFilterStream(stream, compress_stream, is_metadata, nullptr)) { if (willFilterStream(stream, compress_stream, is_metadata, nullptr)) {
return 2; result = 2;
} else { } else {
return 1; result = 1;
} }
}
return result;
}; };
QPDF::Writer::optimize(m->pdf, m->obj, skip_stream_parameters); QPDF::Writer::optimize(m->pdf, m->obj, skip_stream_parameters);