octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-09-20 17:19:08 +00:00
Code Issues Releases Wiki Activity

Fix error with stream recovery (fixes #1042)

Browse Source
This commit is contained in:
Jay Berkenbilt 2023-10-07 13:29:10 -04:00
parent b075de73c8
commit 98014ec98a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2023-10-07 Jay Berkenbilt <ejb@ql.org>
* Bug fix: when piping stream data, don't call finish on failure
if the failure was caused by a previous call to finish. Fixes
#1042.
2023-09-05 Jay Berkenbilt <ejb@ql.org> 2023-09-05 Jay Berkenbilt <ejb@ql.org>
* 11.6.1: release * 11.6.1: release

4
libqpdf/QPDF.cc
View File

@ -2418,6 +2418,7 @@ QPDF::pipeStreamData(
decryptStream(encp, file, qpdf_for_warning, pipeline, og, stream_dict, to_delete); decryptStream(encp, file, qpdf_for_warning, pipeline, og, stream_dict, to_delete);
} }
bool attempted_finish = false;
bool success = false; bool success = false;
try { try {
file->seek(offset, SEEK_SET); file->seek(offset, SEEK_SET);
@ -2432,6 +2433,7 @@ QPDF::pipeStreamData(
length -= len; length -= len;
pipeline->write(buf, len); pipeline->write(buf, len);
} }
attempted_finish = true;
pipeline->finish(); pipeline->finish();
success = true; success = true;
} catch (QPDFExc& e) { } catch (QPDFExc& e) {
@ -2461,7 +2463,7 @@ QPDF::pipeStreamData(
} }
} }
} }
if (!success) { if (!attempted_finish) {
try { try {
pipeline->finish(); pipeline->finish();
} catch (std::exception&) { } catch (std::exception&) {