In QPDFWriter::willFilterStream on runtime error on first attempt retry

without filtering

In QPDFWriter::willFilterStream on runtime error on first attempt retry
without filtering
m-holger
1 parent 642a1110
Showing 3 changed files with 20 additions and 7 deletions
libqpdf/QPDFWriter.cc
qpdf/qtest/qpdf/qjson-bad-data.out
qpdf/qtest/qpdf/qjson-bad-datafile.out
@@ -26,6 +26,8 @@
 #include <cstdlib>
 #include <stdexcept>
+using namespace std::literals;
+
 QPDFWriter::ProgressReporter::~ProgressReporter() // NOLINT (modernize-use-equals-default)
 {
     // Must be explicit and not inline -- see QPDF_DLL_CLASS in README-maintainer
@@ -1296,17 +1298,24 @@ QPDFWriter::willFilterStream(
                 !filter ? qpdf_dl_none : (uncompress ? qpdf_dl_all : m->stream_decode_level),
                 false,
                 first_attempt);
+            if (filter && !filtered) {
+                // Try again
+                filter = false;
+                stream.setFilterOnWrite(false);
+            } else {
+                break;
+            }
         } catch (std::runtime_error& e) {
+            if (filter && first_attempt) {
+                stream.warnIfPossible("error while getting stream data: "s + e.what());
+                stream.warnIfPossible("qpdf will attempt to write the damaged stream unchanged");
+                filter = false;
+                stream.setFilterOnWrite(false);
+                continue;
+            }
             throw std::runtime_error(
                 "error while getting stream data for " + stream.unparse() + ": " + e.what());
         }
-        if (filter && !filtered) {
-            // Try again
-            filter = false;
-            stream.setFilterOnWrite(false);
-        } else {
-            break;
-        }
     }
     if (!filtered) {
         compress_stream = false;
+WARNING: qjson-bad-data.json, obj:4 0 R at offset 0: error while getting stream data: base64-decode: base64 decode: invalid input
+WARNING: qjson-bad-data.json, obj:4 0 R at offset 0: qpdf will attempt to write the damaged stream unchanged
 qpdf: error while getting stream data for 4 0 R: base64-decode: base64 decode: invalid input
+WARNING: qjson-bad-datafile.json, obj:4 0 R at offset 0: error while getting stream data: open file does not exist: No such file or directory
+WARNING: qjson-bad-datafile.json, obj:4 0 R at offset 0: qpdf will attempt to write the damaged stream unchanged
 qpdf: error while getting stream data for 4 0 R: open file does not exist: No such file or directory